From: David Woodhouse Date: Fri, 15 Apr 2005 10:05:33 GMT Subject: Re: Merge with git-pasky II. Message-ID: <1113559533.12012.296.camel@baythorne.infradead.org> In-Reply-To: <20050415093649.GA28077@elte.hu> On Fri, 2005-04-15 at 11:36 +0200, Ingo Molnar wrote: > do such cases occur frequently? In the kernel at least it's not too > typical. Isn't it? I thought it was a fairly accurate representation of the process "I make a whole bunch of changes to files I maintain, pulling from Linus while occasionally asking him to pull from my tree. Sometimes my files are changed by someone else in Linus' tree, and sometimes I change files that I don't actually own.". -- dwmw2