That's why I showed an example of a rename. You write "manually fixed the conflict", where do you see that in the rename example? You just re-apply either sid

That's why I showed an example of a rename. You write "manually fixed the conflict", where do you see that in the rename example? You just re-apply either side of the changes in the conflict (Base->A, or Base->B) and the conflict is then detected as resolved. Reapplying (e.g: via automated rename) is much easier than what people typically mean by "manually resolving the conflict". Also, as a pretty big productivity boost, it prints the conflicts in a way that lets many editors (sublime, emacs, etc) directly jump to conflicts, do the "git add" for you, etc. This converts your everyday editor into a powerful conflict resolution tool. Using the editing capabilities in most merge tools is tedious.