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
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

649 views 0 4
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