SourceTree - Merge strategies - Keep both changes possible through UI?

SourceTree gives us different merge strategies to accept either "theirs" or "mine", but is there a way to keep both changes without having to edit the file manually?

2 answers

This will be the default behavior if the changes don't conflict.  If the do conflict, then human intervention is required.

I totally assumed conflict in my answer. Good clarification.

Darn, I was hoping I could have some functionality like TFS in Visual Studio and accept both changes if they are on the same line.

Visual Studio is a full IDE, SourceTree is just a Git GUI. Some IDEs that have built-in Git support may provide that function.

Only by using an external merge tool.

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...

849 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