I would have thought that supports renames would also involve flagging a
conflict when merging a file that has been renamed on 2 separate
branches. ie 2 branches rename the file to different names and then one
branch is merged into the other. In this situation, the user should be
told of a rename conflict. Bzr supports this as far as I know. Not sure
about git though as I have never used it.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html