How can new users of git submodules learn about merge conflicts? When and why they occur, and how to resolve them in a way that doesn't lose commits? If I have to choose my version or their version, that isn't really a merge, or is it? Thanks. -- View this message in context: http://git.661346.n2.nabble.com/PATCH-git-submodule-Remove-duplicate-entries-during-merge-with-conflict-tp6180061p6584432.html Sent from the git mailing list archive at Nabble.com. -- 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