3 ms·
Using the command line, that would be a merge conflict. If SourceTree is treating it as a successful merge, that would be a bug.
by ryanpetrich 13y ago
Using the command line, that would be a merge conflict. If SourceTree is treating it as a successful merge, that would be a bug.