From: Jens Lehmann <jens.lehmann@web.de>
Date: Fri, 15 Jul 2011 21:41:41 GMT
Subject: Re: [PATCH] git-submodule: Remove duplicate entries during merge with conflict
Message-ID: <4E20B415.8030004@web.de>
In-Reply-To: <1F026B57884A5841B330471696849DE9113122B5@MBX021-W4-CA-5.exch021.domain.local>

Am 15.07.2011 22:32, schrieb Marlene Cote:
> How would you find an appropriate commit?

The same way you resolve conflicts for a regular file: If you are unlucky
and the merge strategy doesn't resolve the conflict for you automatically
(or at least gives you a hint what /could/ be the resolution), you have
to use human judgment to find an appropriate resolution. In most cases
that will be a commit where both conflicting commits show up in the
history (and maybe you'll even have to create one yourself by doing a
proper merge in the submodule).

Where I work we have a simple best practice that guarantees us git will
always find a proper resolution itself: We only record commits that are
on the submodules master branch in the superproject. To put it in other
words: merge the submodule first before you commit in the superproject.