From: Johannes Sixt <j.sixt@viscovery.net>
Date: Wed, 16 Feb 2011 07:05:40 GMT
Subject: Re: [BUG] Replacing dir with submodule causes weird issues with cherry-pick
Message-ID: <4D5B7744.7040409@viscovery.net>
In-Reply-To: <22F69B3E-600C-41AC-911D-B9808A3705E6@inkling.com>

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