On Sun, Jan 15, 2017 at 3:56 PM, Stephan Beyer <s-beyer@xxxxxxx> wrote: > Hi, > > a git-newbie-ish co-worker uses git-stash sometimes. Last time he used > "git stash pop", he got into a merge conflict. After he resolved the > conflict, he did not know what to do to get the repository into the > wanted state. In his case, it was only "git add <resolved files>" > followed by a "git reset" and a "git stash drop", but there may be more > involved cases when your index is not clean before "git stash pop" and > you want to have your index as before. > > This led to the idea to have something like "git stash --continue"[1] > that would expect the user to "git add" the resolved files (as "git > status" suggests) but then leads to the expected result, i.e. the index > being the same as before the conflict, the stash being dropped (if "pop" > was used instead of "apply"), etc. > > Likewise, some "git stash --abort"[2] might be useful in case you did > "git stash pop" with the wrong stash in mind. > > What do you think about that? > This sounds like a useful extension to me. Thanks, Jake