From: Jeff Garzik <jgarzik@pobox.com>
Date: Thu, 09 Jun 2005 03:07:54 GMT
Subject: Re: Handling merge conflicts a bit more gracefully..
Message-ID: <42A7B28A.9010508@pobox.com>
In-Reply-To: <Pine.LNX.4.58.0506081336080.2286@ppc970.osdl.org>

Linus Torvalds wrote:
> Comments? It would be good to have people test this and maybe even write a 
> few automated tests that it all works as expected..

I've got a few libata branches I have been putting off updating to the 
latest kernel, because of merge conflicts ('chs-support' and 'passthru' 
branches of libata-dev.git).

If this merge-gracefully stuff is all checked into git.git, I can 
definitely give it some real-world testing.

	Jeff