7 ms·
SourceTree has been great and Atlassian's support is also excellent. However, I still can't work out how to turn off Git's overly-optimistic automerge, which le
by voltagex_ 13y ago
SourceTree has been great and Atlassian's support is also excellent. However, I still can't work out how to turn off Git's overly-optimistic automerge, which leaves << HEAD strewn through files at random.
- ryanpetrich 13y agoUsing the command line, that would be a merge conflict. If SourceTree is treating it as a successful merge, that would be a bug.