IntelliJ Idea with Git：当自动合并崩溃时，我如何继续手动合并
声明：本页面是StackOverFlow热门问题的中英对照翻译，遵循CC BY-SA 4.0协议，如果您需要使用它，必须同样遵循CC BY-SA许可，注明原文地址和作者信息，同时你必须将它归于原作者（不是我）：StackOverFlow
原文地址: http://stackoverflow.com/questions/11140106/
Warning: these are provided under cc-by-sa 4.0 license. You are free to use/share it, But you must attribute it to the original authors (not me):
StackOverFlow
IntelliJ Idea with Git: when automatic merge crashed, how can I continue to merge manually
提问by sunny
I use IntelliJ Idea with Git. When I pull from repository, I get following error:
我在 Git 中使用 IntelliJ Idea。当我从存储库中提取时，出现以下错误：
" ...CONFLICT (content): Merge conflict in server..."
“ ...CONFLICT（内容）：服务器中的合并冲突...”
Then pull fails.
然后拉失败。
Questions are:
问题是：
- Does IntelliJ Idea displays any log of what happend exactly? How do I see it?
- How can I continue merge manually from the same point (where it failed)?
- IntelliJ Idea 是否显示准确发生的任何日志？我怎么看？
- 如何从同一点（失败的地方）继续手动合并？
采纳答案by LoKi
Looks like you've got a conflict during merge. Go to the ChangesView and see if there are any unmerged files. Then invoke Resolve Conflicts, choose what to take from your changes and theirs, and commit.
看起来您在合并期间遇到了冲突。转到Changes查看并查看是否有任何未合并的文件。然后调用Resolve Conflicts，选择从你的更改和他们的更改中获取的内容，然后提交。
You may also want to try Update Projectfor more intelligent pulling from the tracked branch.
您可能还想尝试Update Project从跟踪分支中进行更智能的拉取。
