【转】解决 Git 的 Merge Conflict

链接：http://www.zhihu.com/question/21215715/answer/17540457

贴一个在公司写的wiki page, meld 很好用。

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)

Usage

• 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;