From: Holger Hellmuth Date: Wed, 28 Mar 2012 19:52:55 GMT Subject: Re: git add -p and unresolved conflicts Message-ID: <4F736C17.4000403@ira.uka.de> In-Reply-To: <7vmx70v8ho.fsf@alter.siamese.dyndns.org> On 28.03.2012 21:19, Junio C Hamano wrote: > Holger Hellmuth writes: > >> I don't think it's that tricky: I was assuming this "tricky" was about a sensible user interface. >> ... >> The tricky part might be sorting the hunks so that conflicts are first >> (depending on how the code works now), choosing the right version in a >> hunk (the three new options) should be relatively easy. > > Code it and then tell us if it is tricky or not. Until then, especially > when you have to say "depending on how the code works now", implying you > do not know, why should we even listen to you? As it is perl I'm already looking at it. I'll try to find out if my meagre programming skills can do something here.