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?
Only by using an external merge tool.
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.
It looks like you're new here. Sign in or register to get started.
