From: Sitaram Chamarty Date: Fri, 29 May 2009 00:59:06 GMT Subject: Re: [RFC PATCH] Documentation: teach stash/pop workflow instead of stash/apply Message-ID: In-Reply-To: On 2009-05-28 09:40:15, Thomas Rast wrote: > Recent discussion on the list showed some comments in favour of a > stash/pop workflow: > > http://marc.info/?l=git&m=124234911423358&w=2 > http://marc.info/?l=git&m=124235348327711&w=2 > > Change the stash documentation and examples to document pop in its own > right (and apply in terms of pop), and use stash/pop in the examples. [snip] > +Applying the state can fail with conflicts; in this case, it is not > +removed from the stash list. You need to resolve the conflicts by hand > +and call `git stash drop` manually afterwards. For what it is worth, when I take classes on git in $DAYJOB I insist on using only save/pop (and drop when needed as described above). My students are largely freshers with little or no dev experience, and this just seems much more intuitive. Even the aspect of having to drop manually is logical, because something exceptional happened. I certainly would appreciate this patch, to answer the "RFC" aspect in your subject line.