Re: `git stash pop` UX Problem

Matthieu Moy [off-list ref] writes:

Stephen Leake [off-list ref] writes:

quoted

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