git - 如何使用 git stash 检索未跟踪的文件

Question

所以我用

stash 了一些未跟踪的文件

git stash --include-untracked

然后切换到另一个分支。

如果我查看 stash 的更改:

backend/infinispan-rar/pom.xml                     |   12 ++++++++++--
backend/pom.xml                                    |   13 +++++++++++--
backend/test/pom.xml                               |    3 +--
.../main/resources/com/mojiva/testDbContext.xml    |    6 +++---
data/mojiva.xml                                    |    2 +-
dbmigration/pom.xml                                |   16 ++++++++++------
.../main/resources/db/changelogs/issue-17544.xml   |    4 ++--
pom.xml                                            |   11 +++++++++++

然后我尝试使用

检索这些文件

git stash pop

得到这个:

backend/activator/effective.pom already exists, no checkout
backend/adverter/src/test/java/com/mojiva/presenter/RequestParamReplacerTest.java already exists, no checkout
backend/dao/.cpath already exists, no checkout
backend/dao/.e0 already exists, no checkout
backend/dao/PutObjectStoreDirHere/defaultStore/Recovery/TransactionStatusManager/#22#/0_ffffc0a86465_cfd2_5016b5cb_1 already exists, no checkout
backend/dao/dep.tree already exists, no checkout
backend/feeds-test/.e0 already exists, no checkout
backend/feeds-test/dep.tree already exists, no checkout
data/wurfl-patch.xml already exists, no checkout
run/linksDB.log already exists, no checkout
run/linksDB.properties already exists, no checkout
run/linksDB.script already exists, no checkout
Could not restore untracked files from stash

注意到没有一个文件是相同的吗？

这是怎么回事？

谢谢!

Answer 1

来自下面提到的关于如何应用使用 -a 而不是 -u 创建的存储的博客:

找到存储的提交:

git log --graph --all --decorate --oneline

检查一下

git checkout <sha>

重置 parent :

git reset HEAD~1

创建一个干净的存储空间:

git stash -u

您现在可以 checkout master 并应用新的存储。

https://blog.tfnico.com/2012/09/git-stash-blooper-could-not-restore.html# !