Eclipse EGIT - 所有承诺，拉，合并，标记为合并，仍然推动我得到“拒绝 - 非快进”，我还缺少什么？ [英] Eclipse EGIT - all committed, pulled, merged, marked as merged, still on push I get "rejected - non-fast forward", what am I missing?

问题描述

我开始尝试Git，而且我确定我缺少某些东西，因为我无法做一个简单的合并和推动。

这里是我做的（我可能按顺序错了，或者按顺序出错，请改正）

• pull


• Syncronize Workspace


• 冲突 - 手动合并


• 然后标记为合并（是有必要吗？）


• 其余 - 允许自动合并


• 提交我的更改


• （origin-master）


• 我得到着名的拒绝 - 非快进


• 做了一个 检查 - 没有更新


• 做了另一个提交 - 没有提交

什么是我失踪了

不知道是否相关，但是我在Eclipse Indigo（SR2，build 20120216-1857）中使用Windows 7，EGit（1.3.0.201202151440-1），并推送到GitHub

解决方案

我想我发现了，而不是标记为合并，我需要做添加

手动冲突解决

要解决冲突，您必须执行以下步骤： / p>

导航到冲突的资源编辑冲突资源的内容告诉EGit冲突是通过团队 - >添加

通过团队>提交

从< a href =http://wiki.eclipse.org/EGit/User_Guide#Manual_conflict_resolution =noreferrer> http://wiki.eclipse.org/EGit/User_Guide#Manual_conflict_resolution

编辑：显然，我应该学习git命令lin e在玩EGit之前，同样的概念在那里

I'm starting to experiment with Git, and I'm sure I'm missing something, as I can't do a simple merge and push

Here is what I do (I probably got it in the wrong order, or wrong in any order, please correct if it is)

• pull
• Syncronize Workspace
• on conflicts - did a manual merge,
• then "Mark as Merged" (is it necessary?)
• on the rest - allowed the automatic merge
• commit my changes
• pressed push (origin-master)
• I get the famous "rejected - non-fast forward"
• did a "fetch" to check - nothing to update
• did another commit - nothing to commit

What am I missing?

Not sure if it's relevant but I'm using Windows 7, EGit (1.3.0.201202151440-1) in Eclipse Indigo (SR2, build 20120216-1857) and pushing to GitHub

解决方案

I think I found it, instead of "Mark as Merged", I need to do "Add"

Manual conflict resolution

To resolve a conflict you have to do the following steps:

Navigate to the conflicting resource Edit the content of the conflicting resource Tell EGit that the conflict is resolved with Team -> Add

Commit the conflict resolution with Team > Commit

from http://wiki.eclipse.org/EGit/User_Guide#Manual_conflict_resolution

Edit: apparently, I should have learned git command line before playing with EGit, same concept there

这篇关于Eclipse EGIT - 所有承诺，拉，合并，标记为合并，仍然推动我得到“拒绝 - 非快进”，我还缺少什么？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！