From: Linus Torvalds <torvalds@osdl.org>
Date: Thu, 28 Apr 2005 00:21:19 GMT
Subject: Re: git pull on ia64 linux tree
Message-ID: <Pine.LNX.4.58.0504271719380.18901@ppc970.osdl.org>
In-Reply-To: <20050428000729.GT22956@pasky.ji.cz>



On Thu, 28 Apr 2005, Petr Baudis wrote:
> 
> Hmm, doesn't the three-way read-tree -m take care of that? Then it
> should hit

Yes, you're right, I didn't think about the fact that the helper script 
actually does the checkout for the clashing files it merges.

(Which is not really nice, because it means that some files get updated 
and others don't, depending on how they were merged, but whatever..)

			Linus