如何从`git stash pop`解决子模块上的git合并冲突

Question

我有一个带子模块的git存储库.我需要弹出我之前隐藏的变化.但是,这会导致子模块引用上出现合并冲突.

除了子模块之外,我想保留我对存储的更改.对于大多数代码文件,我可以通过编辑冲突文件来解决冲突,但这似乎不是子模块的选项.

如何解决合并冲突并仍然从存储中提取我的更改？

$ git stash pop
warning: Failed to merge submodule some-submodule (commits don't follow merge-base)
Auto-merging some-code
Auto-merging some-submodule
CONFLICT (submodule): Merge conflict in some-submodule

---

$ git status
# On branch some-branch
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#   modified:   some-code
#
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#   both modified:      some-submodule

Answer 1

正如git status评论所说:git reset HEAD some-submodule.

顺便说一句,在你仔细检查了你的树和索引应该如何之后,你可能会想要git stash drop.git stash pop通常会那样做,但是当有冲突时就不会这样做.