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

[Prem Mariappan]

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.

[Prem Mariappan · Accepted solution]

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

[Seth]

That's exactly right.