From: Jeff King <peff@peff.net>
Date: Thu, 29 Mar 2012 06:08:53 GMT
Subject: Re: git add -p and unresolved conflicts
Message-ID: <20120329060853.GD27604@sigill.intra.peff.net>
In-Reply-To: <4F736C17.4000403@ira.uka.de>

On Wed, Mar 28, 2012 at 09:52:55PM +0200, Holger Hellmuth wrote:

> On 28.03.2012 21:19, Junio C Hamano wrote:
> >Holger Hellmuth<hellmuth@ira.uka.de>  writes:
> >
> >>I don't think it's that tricky:
> 
> I was assuming this "tricky" was about a sensible user interface.

I think maybe the discussion elsewhere in this thread has given you a
taste of the trickiness, but if you want to read more, here is a similar
discussion from the same time last year (ahh, Spring, when a young man's
thoughts turn to partial staging of conflicted hunks):

  http://thread.gmane.org/gmane.comp.version-control.git/168403/focus=168842

-Peff