From: Andreas Ericsson <ae@op5.se>
Date: Tue, 18 Jan 2011 16:08:01 GMT
Subject: Re: problem with cherry-picking a commit which comes before introducing a new submodule
Message-ID: <4D35BAE1.6090204@op5.se>
In-Reply-To: <20110118160222.GA23926@onerussian.com>

On 01/18/2011 05:02 PM, Yaroslav Halchenko wrote:
> 
> On Tue, 11 Jan 2011, Jonathan Nieder wrote:
>> ...
>> a submodule might be another reason for a directory in the worktree.
>> In any event, we get a spurious conflict.
>> Thanks, that was interesting (no patch yet, alas).
> 
> is there a way to memorize this issue somewhere (bug tracking/TODO/etc)
> where this issue could be recorded so it doesn't get forgotten? ;)
> 

It will be stored in the hive-mind of the mailing list participants.
It's quite a bit better than it sounds actually.

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231

Considering the successes of the wars on alcohol, poverty, drugs and
terror, I think we should give some serious thought to declaring war
on peace.