From: Stephen Leake <stephen_leake@stephe-leake.org>
Date: Fri, 28 Feb 2014 17:27:46 GMT
Subject: Re: `git stash pop` UX Problem
Message-ID: <85vbvz171p.fsf@stephe-leake.org>
In-Reply-To: <vpq38j3z1jj.fsf@anie.imag.fr>

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:

> Stephen Leake <stephen_leake@stephe-leake.org> writes:
>
>> So it appears that adding a file _does_ tell git that the conflict is
>> resolved.
>
> Yes it does. Git _knows_ that you consider the conflict to be resolved.
> It cannot know how happy you are with the result.
>
> Similarly, in a conflicted merge, the last "git add" does not trigger a
> commit silently. And a silent commit would be much less serious than a
> silent data drop.

Ok, I see your point now.

So a message "merge complete; you can drop the stash" would be the most
git should do.

-- 
-- Stephe