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; } } }

Using Mercurial Sourcetree to resolve Merge Conflict when I need 2-way resolution

ralvy

Suppose I have 2 branches, Branch 1 and Branch 2, and I have made changes to the same file in both branches. Further suppose I have made 2 changes in each file, where Change 1 is to the same line in each file, and Change 2 is to the same line in each file. And finally, I choose Merge. I want Change 1 in Branch 1 to win, and I want Change 2 in Branch 2 to win.

I don't see a way to do this with Sourcetree without calling my External Merge Tool. It seems that the Resolve Conflct options are all or nothing in terms of Mine vs Theirs. Is that correct?

Accepted answers

minnsey

Hi

That is correct, from within Sourcetree we offer file level theirs/mine options for but for more nuanced merges re rely on the external tools.

All comments

minnsey

Hi

That is correct, from within Sourcetree we offer file level theirs/mine options for but for more nuanced merges re rely on the external tools.

Welcome!

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

Quick Links

Find more posts tagged with

sourcetree

mercurial

merge