“无法拉入具有以下状态的存储库：merging_resolved” [英] "cannot pull into a repository with state: merging_resolved"

问题描述

经过一番拉，合并和冲突解决后，我的GIT卡住了。这是我在主项目上试图做的（与EGit）：

• Pull返回无法拉入具有状态的存储库：mergeing_resolved
  
• 从上游获取返回无法从GeniusWebSocket中获取 - 源 - 所有内容都是最新的。


• Merge 推到上游返回拒绝 - 非快进。


• 添加到索引不会执行任何操作。
  

在项目标题附近，我看到[Merge master up-arrow 1 down-arrow 1]。

  $ git status 
＃在分支大师
＃你的分支和'origin / master'已经分开了，
＃并且分别有1个和1个不同的提交。 
 $ 
没有提交（工作目录清理）
  

我该如何处理？

解决方案

由于您已完成合并，并且如果您没有任何待处理的更改，可以尝试 git reset --hard ，然后查看问题是否仍然存在。
（请参阅 EGit重置您当前的HEAD ）

---

Ankit Marothi 建议< a href =https://stackoverflow.com/questions/16271906/cannot-pull-into-a-repository-with-state-merging-resolved/16273416#comment87044382_16273416>在评论中：

我通过使用 Team-> Reset 从egit中重置它并使用 mixed reset 作为选项。

After some pulling, merging and conflict resolving, my GIT is stuck. This is what I tried to do (with EGit) on the main project:

• "Pull" returns "cannot pull into a repository with state: merging_resolved"
• "Fetch from upstream" returns "No ref to fetch from GeniusWebSocket - origin - everything up to date."
• "Merge" is greyed in the menu.
• "Commit" returns "Commit/amend not possible...".
• "Push to upstream" returns "rejected - non-fast-forward".
• "Add to index" does nothing.

Near the project title, I see [Merged master up-arrow 1 down-arrow 1].

$ git status
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 1 different commit each, respectively.
#
nothing to commit (working directory clean)

How can I proceed?

解决方案

Since you have finished your merge, and if you don't have any pending changes, you can try a git reset --hard, and see if the issue persists. (See EGit reset your current HEAD)

---

Ankit Marothi suggests in the comments:

I resolved it by resetting it from egit, using Team->Reset and using mixed reset as the option.

这篇关于“无法拉入具有以下状态的存储库：merging_resolved”的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！