Re: `git stash pop` UX Problem
- From
Simon Ruderich <simon@ruderich.org>
- Date
- Feb 26, 2014, 00:39 UTC
- Message-ID
- <20140226003938.GA6809@ruderich.org>
- In-Reply-To
- <vpqlhx0a3cb.fsf@anie.imag.fr>
On Mon, Feb 24, 2014 at 05:21:40PM +0100, Matthieu Moy wrote:
> One easy thing to do OTOH would be to show a hint at the end of "git > stash pop"'s output, like
I think that's a good idea. It makes it obvious that Git has kept the stash and that the user should drop it when he's done - if he wants to.
Show 8 quoted lines
> $ git stash pop > Auto-merging foo.txt > CONFLICT (content): Merge conflict in foo.txt > 'stash pop' failed. Please, resolve the conflicts manually. The stash > was not dropped in case you need to restart the operation. When you are > done resolving the merge, you may run the following to drop the stash: > > git stash drop
Maybe just the following to keep the output on a single line:
Use 'git stash drop' to remove the stash after resolving the conflicts.
But maybe that's too short as it doesn't mention explicitly, that the stash was kept.
Regards Simon
-- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9