Eclipse EGit Checkout与文件冲突： - EGit不想继续 [英] Eclipse EGit Checkout conflict with files: - EGit doesn't want to continue

问题描述

我已经启动了Eclipse EGit。在某些情况下，实际上并不全面。

我有本地文件pom.xml已更改。在git服务器上，该文件已更改。
我做拉，EGIt说：

Checkout与文件冲突：

ie拉停止（ fetch 已完成，但不是 merge ），那可以。但是下一个是不好的经历。

我同步工作区，把我的改变放在一边，使其与FETCH_HEAD相同。但是EGit不想继续。我用HEAD修订版替换文件。但是，EGit仍然不想继续。

冲突解决后，EGit应该使用什么标准的预期用户操作？

更新：

我添加到索引，然后标记为合并 - > 拉仍然无法通过。

当我选择合并我得到对话框

我不能提交文件，因为它不在更改的文件列表中。

解决方案

情况

• 您有本地未提交的更改


• 您从主站回购


• 您会收到错误Checkout与文件的冲突：xy






解决方案：






• 舞台和提交（至少）文件xy


• 再次拉一下


• 如果自动合并是可能的如果没有，该拉合并文件并插入合并冲突标记（<<<<<，<，>>>>
  
  
  
  • 手动编辑冲突文件
  
  


• 提交并推送





I've started Eclipse EGit. In some scenarios it is really not comprehensive.

I have local file e.g. pom.xml changed. On git server this file was changed. I do pull, EGIt says:

Checkout conflict with files:

i.e. pulling stops (fetch is done, but not merge), that is OK. However the next is bad experience.

I synchronize workspace, put my changes aside and make it the same as FETCH_HEAD. But EGit doesn't want to continue. I replace the file with HEAD revision. But EGit still doesn't want to continue.

What standard expected user operation should be with EGit after conflict resolution?

UPDATE:

I added to index, then marked as Merged -> pull still can't pass.
When I select Merge I get the dialog

I can't commit the file as it is not in list of changed files.

解决方案

Situation:

• You have local uncommitted changes
• You pull from the master repo
• You get the error "Checkout conflict with files: xy"

Solution:

• Stage and commit (at least) the files xy
• Pull again
• If automerge is possible, everything is ok.
• If not, the pull merges the files and inserts the merge-conflict markers (<<<<<<, >>>>)
  • Manually edit the conflicting files
• Commit and push

这篇关于Eclipse EGit Checkout与文件冲突： - EGit不想继续的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！