Merge conflict when modifying a branch

 

This question already has an answer here:

  • How to resolve merge conflicts in Git? 32 answers

    • Either you can edit the files in conflict manually, and do a commit again. Otherwise you can use 

    $> git mergetool

    Now you can decide whether to keep your change or their change. 

        git checkout --ours FileYouWantToKeepYourChange
    git checkout --theirs FileYouWantToKeepTheirChange
    git add FileYouWantToKeepYourChange, FileYouWantToKeepTheirChange
    git commit -m "Conflict resolved"
    链接地址: http://www.djcxy.com/p/7222.html

    上一篇: 解决Git合并冲突的步骤

    下一篇: 修改分支时合并冲突