http://stackoverflow.com/questions/2452226/master-branch-and-origin-master-have-diverged-how-to-undiverge-branches
Personally, I'd go for 'rebase' as Jeff said in the answer.
|
Friday, August 21, 2015
Lesson 56: "Your branch and 'origin/master' have diverged
The option it to either to 'merge' or 'rebase', please take a look at this link below:
http://stackoverflow.com/questions/2452226/master-branch-and-origin-master-have-diverged-how-to-undiverge-branches
Personally, I'd go for 'rebase' as Jeff said in the answer.
http://stackoverflow.com/questions/2452226/master-branch-and-origin-master-have-diverged-how-to-undiverge-branches
Personally, I'd go for 'rebase' as Jeff said in the answer.
Subscribe to:
Post Comments (Atom)
git pull --rebase– Jeffrey Jose Apr 9 '11 at 15:16