Merging a bitbucket upstream branch with SourceTree

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 ?

1 answer

1 accepted

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.

Thanks steve, I picked one and merged to the other, unfortunately looks like it was the bad one :

abort: push creates new remote head f4b0a1404147!
(did you forget to merge? use push -f to force)

Suggest an answer

Log in or Join to answer
Community showcase
Piotr Plewa
Published Dec 27, 2017 in Bitbucket

Recipe: Deploying AWS Lambda functions with Bitbucket Pipelines

Bitbucket Pipelines helps me manage and automate a number of serverless deployments to AWS Lambda and this is how I do it. I'm building Node.js Lambda functions using node-lambda&nbsp...

706 views 0 4
Read article

Atlassian User Groups

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!

Find my local user group

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

Groups near you
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot