Elijah Newren <new...@gmail.com> writes: > File/directory conflicts are somewhat difficult to resolve; by way of > contrast, renames are much easier to handle. For file/directory > conflicts, we already have to record the file under a different name in > the working copy due to the directory being in the way; if we also record > the file under a different name in the index then it simplifies matters > for the user, and ensures that 'git reset --hard' and 'git merge --abort' > will clean up files created by the merge operation.
Yeah, and then our file "path" renamed to "path~2" to make room for directory "path" they introduced, can be relocated to its final place in the merge resolution, e.g. "git mv path~2 path/ours" or "git mv path path.theirs && git mv path~2 path". Of course, "git rm" and "git mv" must work sensibly, if we want this change to be truly helpful--but if not, they need to be fixed ;-)
