Re: problem with cherry-picking a commit which comes before introducing a new submodule
From: Yaroslav Halchenko <hidden>
Date: 2016-06-15 22:50:25
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? ;) -- Yaroslav O. Halchenko Postdoctoral Fellow, Department of Psychological and Brain Sciences Dartmouth College, 419 Moore Hall, Hinman Box 6207, Hanover, NH 03755 Phone: +1 (603) 646-9834 Fax: +1 (603) 646-1419 WWW: http://www.linkedin.com/in/yarik