Merging a bitbucket upstream branch with SourceTree

dguardiola

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 <a href="http://upstream-repo%3C/code" rel="nofollow noopener noreferrer">http://upstream-repo</code<>></a>

<a href="http://upstream-repo%3C/code" rel="nofollow noopener noreferrer"> <p><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 ?

stevestreeting

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.