nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

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.

Accepted answers

Prem Mariappan

OK - Here's what I have so far:

Update to working copy to default by double clicking on "default" under Branches - $ hg up default
Bring up context menu on your named branch & select "Merge your-named-branch into default" - $ hg merge your-named-branch
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)
Commit - $ hg ci -m merge

All comments

Prem Mariappan

OK - Here's what I have so far:

Update to working copy to default by double clicking on "default" under Branches - $ hg up default
Bring up context menu on your named branch & select "Merge your-named-branch into default" - $ hg merge your-named-branch
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)
Commit - $ hg ci -m merge

Seth

That's exactly right.

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

sourcetree