Git隐藏pop - 需要合并，无法刷新索引 [英] Git stash pop- needs merge, unable to refresh index

问题描述

我不能弹出我的藏宝箱，因为我合并了一个明显与我的藏宝箱冲突的宝宝，现在我的宝箱似乎无法被弹出。  app.coffee：需要合并
无法刷新索引
  

任何人知道如何解决这个问题？

固定！

原来的问题解决方案：提交冲突的文件。

解决方案：首先，请检查 git status 。

As

解决方案操作系统提到，

实际的问题是来自合并的未解决的合并冲突，而不是该存储会导致合并冲突。

p>

这就是 git status 会将该文件称为均已修改

R esolution：提交冲突的文件。

---

4天前可以找到类似的情况（2012年3月13日）与此帖'拉不是可能是因为你有未合并的文件

  julita @ yulys：〜/ GNOME / baobab / help / C $ git stash pop 
 help / C / scan-remote.page：需要合并
无法刷新索引
  

您所做的是修复合并冲突（编辑正确的文件并提交）：

请参阅我如何解决合并冲突在Git？

什么博客文章的作者所做的是：

  julita @ yulys：〜/ GNOME / baobab / help / C $ git reset --hard origin / mallard-documentation 
 HEAD现在位于ff2e1e2为扫描的可选信息添加更多步骤。 
  

即，完全中止当前合并，允许 git stash pop 来应用。

请参阅在Git中取消合并。

这是你的两个选择。

I can't pop my stash because I merged a branch which apparently conflicts with my stash and now my stash is seemingly unable to be popped.

app.coffee: needs merge
unable to refresh index

Anyone know how to resolve this?

FIXED!

Turns out the actual issue was an unresolved merge conflict from the merge, NOT that the stash would cause a merge conflict.

Resolution: Commit the conflicted file.

解决方案

First, check git status.
As the OP mentions,

The actual issue was an unresolved merge conflict from the merge, NOT that the stash would cause a merge conflict.

That is where git status would mention that file as being "both modified"

Resolution: Commit the conflicted file.

---

You can find a similar situation 4 days ago (March 13th, 2012) with this post "‘Pull is not possible because you have unmerged files’"

julita@yulys:~/GNOME/baobab/help/C$ git stash pop
help/C/scan-remote.page: needs merge
unable to refresh index

What you did was to fix the merge conflict (editing the right file, and committing it):
See "How do I fix merge conflicts in Git?"

What the blog post's author did was:

julita@yulys:~/GNOME/baobab/help/C$ git reset --hard origin/mallard-documentation
HEAD is now at ff2e1e2 Add more steps for optional information for scanning.

I.e aborting the current merge completely, allowing the git stash pop to be applied.
See "Aborting a merge in Git".

Those are your two options.

这篇关于Git隐藏pop - 需要合并，无法刷新索引的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！