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?
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.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Visual Studio is a full IDE, SourceTree is just a Git GUI. Some IDEs that have built-in Git support may provide that function.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Only by using an external merge tool.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.