Source Tree never shows this correctly.
If one branch changes a file. The other one you're merging from deleted the file, you see the conflict but you have no way to know if that file was deleted.
The diff shows there's no difference. External diff tool doesn't open, it stays with the popup but nothing happens. But on one side it was deleted and you have no idea that happened visually.
Doing it by hand is easy, but when doing big commits, you have no idea what happened with each file. What to choose, and sometimes if a rename of the file happened, it is considered a deletion + addition , which utterly ignores your local branch changes.
GitHub tool shows "file does't exist in one of the branches", at least. How do I know what happened with a file in SourceTree?
