I managed to recreate your issue. It seems if you stash untracked files and then you create those files (in your example, foo.txt and bar.txt), then you have local changes to untracked files that would be overwritten when you apply git stash pop. To get around this issue, you can use the following command. This … Read more
See man git merge (HOW TO RESOLVE CONFLICTS): After seeing a conflict, you can do two things: Decide not to merge. The only clean-ups you need are to reset the index file to the HEAD commit to reverse 2. and to clean up working tree changes made by 2. and 3.; git-reset –hard can be … Read more
Update 2: I’m not sure why people are complaining about this answer, it seems to be working perfectly with me, for the untracted files you can add the -u flag The full command becomes git stash –keep-index -u And here’s a snippet from the git-stash help If the –keep-index option is used, all changes already … Read more
Try using How to recover a dropped stash in Git? to find the stash you popped. I think there are always two commits for a stash, since it preserves the index and the working copy (so often the index commit will be empty). Then git show them to see the diff and use patch -R … Read more
Stash is just a convenience method. Since branches are so cheap and easy to manage in git, I personally almost always prefer creating a new temporary branch than stashing, but it’s a matter of taste mostly. The one place I do like stashing is if I discover I forgot something in my last commit and … Read more
tl;dr Run git add first. I just discovered that if your uncommitted changes are added to the index (i.e. “staged”, using git add …), then git stash apply (and, presumably, git stash pop) will actually do a proper merge. If there are no conflicts, you’re golden. If not, resolve them as usual with git mergetool, … Read more
For what it’s worth, another way to do this is to stage the changes you want to keep, and then stash everything using –keep-index: $ git add modified-file.txt $ git stash push –keep-index The commands above will stash everything, but it will leave the files staged in your working directory. From the official Linux Kernel … Read more
Note: I’ve just rewritten this answer with 24 hours more git-fu under my belt 🙂 In my shell history, the whole shebang is now three one-liners. However, I’ve uncondensed them for your convenience. This way, I hope you will be able to see how I did things, instead of just having to blindly copy/paste stuff. … Read more
Let’s assume your stash list looks like this: $ git stash list stash@{0}: WIP on master: Add some very important feature stash@{1}: WIP on master: Fix some silly bug First, you must remove stash entry which you want to rename: $ git stash drop stash@{1} Dropped stash@{1} (af8fdeee49a03d1b4609f294635e7f0d622e03db) Now just add it again with new … Read more
According to the git-stash manpage, “A stash is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at HEAD when the stash was created,” and git stash show -p gives us “the changes recorded in the stash as a diff between the stashed state … Read more