Aaron and Billy are working on the same file (abcd.text) on master. Aaron committed the file first. When Billy do git pull, he has a conflict. How can Billy take in the changes from Aaron and still keep his own changes? What is the best way to achieve this?
Asked
Active
Viewed 53 times
-3
-
1Are you asking us to answer your homework question for you? – matt Jun 05 '20 at 03:27
-
What does "best" here even mean? There are ways of handling conflicts, and they depend on the code, the tools you have, and the type of conflicts. Billy should go examine the conflicts and if needed talk with Aaron. – Gino Mempin Jun 05 '20 at 03:33
1 Answers
0
To get the changes with [rebasing local changes]
git pull --rebase
This can result in conflict and those needs to be manually resolved. Reference.
After resolving
git add resolved_files
Rebasing is not complete due to conflicts, now continue the rebase
git rebase --continue
This should solve your issue. There are of course many different ways to acheive the same but I feel this is the simplest.
Sitesh
- 1,816
- 1
- 18
- 25