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

3 votes
Accepted answer

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
Community showcase
Published Oct 23, 2018 in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

727 views 3 2
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