Git merge using recursive strategy and patience option

前端 未结 2 1244
既然无缘
既然无缘 2021-02-05 03:55

How to merge a branch with git using patience option provided by the recursive strategy? I\'m using git version 1.7.3.1.msysgit.0

Even docs are not consistent and, what\

2条回答
  •  温柔的废话
    2021-02-05 04:37

    The --patience option for git merge-recursive was introduced in commit 58a1ece478c6038a7eb0b6e494d563bd5e6d5978. You can find out in a clone of git.git what versions contain this change with git tag --contains 58a1ece478:

    v1.7.4
    v1.7.4-rc0
    v1.7.4-rc1
    v1.7.4-rc2
    v1.7.4-rc3
    v1.7.4.1
    

    So I suspect that you're just using a slightly too old version of mSysGit. There is a preview version of 1.7.4 available now - I think you should try that one.

    I've just tried this with git version 1.7.4, and the following command line syntax works for me:

    git merge -s recursive -X patience other-branch
    

提交回复
热议问题