I forked a Bitbucket repository with SourceTree
I created a pull request from bitbucket and my changes were merged. Now i want to merge others upstream repository changes to my fork (sync it).
I clicked in Bitbucket on the "compare fork"/ incoming button and got three command lines to use.
hg pull -r default http://upstream-repo</code<>>
hg update default
The third one "hg merge 925c1611d764" did not complete :
abandon : merging with a working directory ancestor has no effect
Now in source tree I can see I can see two local "default" branches, and I can't push to my fork anymore because it says this will create another new "default" branch.
What should I do to get out of this situation ?
You just need to merge one of the default branch heads into the other one, so update to one of them, then right click the other and select 'Merge'. Once the merge is done, check if you have any conflicts to resolve as usual, then commit / push.
It shouldn't matter which one you picked, since both should have a common ancestor. Are you sure there's not another head still lying around somewhere?
If not, then this is probably just because someone else has pushed before you did, so you need to pull their changes, merge them too, then push.
As a project manager, I have discovered that different developers want to bring their previous branching method with them when they join the team. Some developers are used to performing individual wo...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs