Am 2/16/2011 0:19, schrieb Kevin Ballard: > If I replace a directory in my project with a submodule, then later attempt to > cherry-pick a commit that predates this change (but does not touch the directory), > git always marks the submodule path as containing an created/deleted merge conflict. Known breakage; t3030 tests for it. 7d82b06d talks about a file/directory conflict, though. -- Hannes -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html