Eclipse resolve conflict git
1. Pull 下载远程代码到本地仓库
2. Conflict Detected 检测冲突
Merge Tool 合并工具
Resolve Conflicts 解决冲突
界面介绍:左边为您当前编辑的文件版本,右边为远程下载到本地仓库后检测到的冲突的版本。
这个步骤的主要关键点:在左侧编辑,至少修改一个字符后(通常会要比对,然后编辑),保存文件。然后进行下一步。
The Merge tool is handled similar to SVN conflict resolution. You have to do one at least one edit in the local (left) source file and save. Otherwise the conflicts will not be resolved. To ensure merging worked, open the source file in its default editor.
3. Push 上传
本文来自博客园,作者:CarlZeng,转载请注明原文链接:https://www.cnblogs.com/backuper/p/Eclipse_resolve_conflict_git.html
需求沟通链接 扫客服加群:
![](https://images.cnblogs.com/cnblogs_com/backuper/933606/o_240408031754_%E6%89%AB%E5%AE%A2%E6%9C%8D%E5%8A%A0%E7%BE%A4.png)