From: funeeldy Date: Thu, 14 Jul 2011 18:33:39 GMT Subject: Re: [PATCH] git-submodule: Remove duplicate entries during merge with conflict Message-ID: <1310668419989-6584432.post@n2.nabble.com> In-Reply-To: <4D81C1AA.5010008@morey-chaisemartin.com> 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.