本文介绍如何利用Meld这一强大的三路比较合并工具来处理Git中的分支合并冲突问题。通过安装Meld并将其设置为Git默认的合并工具，可以有效解决合并过程中出现的文件冲突，提高开发效率。
贴一个在公司写的wiki page, meld 很好用。
Configuration
Usage
Configuration
- meld is a useful three-way-compare merge tool. you can use it in Git.
sudo apt-get install meld; (install meld)
git config --global merge.tool meld; (set Git merge tool default as meld)
- When you merge a branch in Git, it may get into conflict state, if you need to go on, you need fix these conflict, but if you need to go back to the state before merge, you can you use
git reset --hard; (get me back)
- If you want to fix the conflicts, use
git mergetool;
ｖｉｍ党可以用这个：git config --global merge.tool vimdiff;
扫一扫
1084
被折叠的 条评论
为什么被折叠?
到【灌水乐园】发言
