Re: git add -p and unresolved conflicts

From: Holger Hellmuth <hellmuth@ira.uka.de>
Date: Mar 28, 2012, 19:14 UTC
Message-ID: <4F73632E.1060408@ira.uka.de>
In-Reply-To: <vpqvclozr7e.fsf@bauges.imag.fr>

On 28.03.2012 17:21, Matthieu Moy wrote:

Show 7 quoted lines

> Junio C Hamano<gitster@pobox.com>  writes:
>
>> I mildly suspect nobody would come up with a sane behaviour, but what
>> would I know...
>
> Designing a per-hunk behavior would clearly be very tricky.
>

I don't think it's that tricky:

For a conflicted file show any conflicted hunks first(!) and only provide the following options for them: q - quit, do not stage... d - do not stage this hunk nor any of the remaining hunks in the file e - manually edit the current hunk ? - print help

and additionally the following three options:
b - choose the base version
< - choose our version
 > - choose their version

< and > correspond to the conflict markers, alternatives would be o and t

The user now has the option to remove the conflicts (through editing or choosing one of the versions) or abort adding the file.

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.