From: Steffen Prohaska Date: Sun, 15 Jul 2007 18:58:39 GMT Subject: Re: Questions about git-fast-import for cvs2svn Message-ID: <877A33E8-7C61-4E36-BF07-5819914FCE21@zib.de> In-Reply-To: On Jul 15, 2007, at 8:51 PM, Steffen Prohaska wrote: > I'm not sure if merges help to solve the situation described by > Michael. > From my understanding the situation is more like starting a branch and > later 'cherry-picking' commits from various other branches at > different > times. Michael describes a situation where a branch would need to > start > from multiple commits. I think this is different from merging. [ Hmm.. should have checked my email another time to avoid the race condition with Linus ...] Steffen