Re: Handling merge conflicts a bit more gracefully..

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