I have two related branches A and B. When a file X (which existed in both branches) was removed in branch A and I merge A into B, then the file X is marked as conflict. When selecting the file in SourceTree the diff view is empty and it says that there are no modifications. There is no indication whatsoever that this file was removed in one of the branches.

If I open the git bash and do a git status I clearly see that the file was deleted and in which branch. So git knows about this. It would be nice if this information would also be visible in the SourceTree UI.

Additionally, when resolving the conflict by chosing "Resolve using theirs" (theirs being branch A where the file was originally deleted) the conflict is just cleared and the file disappears from the index. This has the effect that committing this merge does not delete the file but keeps it. I would have expected that chosing theirs would instead mark the file as to-be-removed (and shows it as this in the index) because it was removed in that branch.

So in order to handle deleted files correctly during a merge I currently have to run git status in parallel to identify deleted files and then manually click Remove in SourceTree instead of resolving/merging the conflict. This is very inconvenient and error prone.