Which version of the git file will be finally used: LOCAL, BASE or REMOTE?

前端 未结 8 1475
故里飘歌
故里飘歌 2020-11-28 17:39

When there\'s a collison during git merge, I open a mergetool called Meld. It opens three files LOCAL, BASE and REMOTE. As I\'ve read LOCAL is my local branch,

8条回答
  •  感动是毒
    2020-11-28 18:05

    Cosmin's solution works, but the $BASE file is updated--not $MERGED. This will update the $MERGED file:

    Meld: v1.8.4

    [merge]
      conflictstyle = diff3
      tool = mymeld
    [mergetool "mymeld"]
      cmd = meld --auto-merge --output $MERGED $LOCAL $BASE $REMOTE --diff $BASE $LOCAL --diff $BASE $REMOTE
    

提交回复
热议问题