How to merge a branch back to default using Sourcetree (Mercurial)

Hi,

Just wondering how to merge a named branch back to default using Sourcetree please. Effectively the Sourcetree version of this command line procedure.

Thanks.
Prem.

1 answer

1 accepted

OK - Here's what I have so far:

  1. Update to working copy to default by double clicking on "default" under Branches - $ hg up default
  2. Bring up context menu on your named branch & select "Merge your-named-branch into default" - $ hg merge your-named-branch
  3. Resolve any conflicts (I was able to do it when selecting the tip with uncommitted changes, finding the files that had conflicts and selecting the appropriate resolution via the context menu -> Resolve Conflicts -> Resolve Using Mine/Theirs or Launch External Merge Tool on the file)
  4. Commit - $ hg ci -m merge

That's exactly right.

Suggest an answer

Log in or Sign up to answer
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

647 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