Re: git add -p and unresolved conflicts

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 28, 2012, 17:17 UTC
Message-ID: <7vehscwspt.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CABPQNSYp7k82mjzNqZmBX+7Dh6R7rgjQ3ZNqikZyM71GshMqqg@mail.gmail.com>

Erik Faye-Lund <kusmabite@gmail.com> writes:

Show 10 quoted lines

> So, the options are:
>  1) Keep the current behavior
>  2) Abort with an error immediately if one of the picked paths are in
> a conflicted state
>  3) Abort with an error when first encounter a path that is in a
> conflicted state
>  4) Warn and skip any paths that are in a conflicted state
>  5) Implement "git add -p" for conflicted files (if we can agree on a behavior)
>
> 1) and 3) makes little sense to me.

I do not think 1, 2, or 3 makes any sense to me if you are proposing to change anything. Why did you even bother to list them?

Given that you wrote "(if we can...)" for #5, in the short term, #4 is the only sensible thing to do, I would think.