Skip to content

Instantly share code, notes, and snippets.

@panghea

panghea/file0.txt

Created June 10, 2013 14:34
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save panghea/5749164 to your computer and use it in GitHub Desktop.
Save panghea/5749164 to your computer and use it in GitHub Desktop.
Download ZIP
stashからapplyやpopができなくなった時。 ref: http://qiita.com/items/42715a87f681802883bc
Raw
file0.txt
git stash save -u
Raw
file1.txt
git stash apply
Raw
file2.txt
A.txt already exists, no checkout
Could not restore untracked files from stash
Raw
file3.txt
git merge "stash@{0}"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment