How to merge all files manually in Git?

后端 未结 7 2023
遥遥无期
遥遥无期 2021-01-30 01:30

I want to merge all files manually with meld or any other diff tool, how can I do this with Git?
When I run git mergetool it says no

相关标签:
7条回答
  • 2021-01-30 02:11

    Note, if you insists of merging manually (perhaps for a certain class of files), you still can define a merge driver.
    You have a concrete example in "Git - how to force merge conflict and manual merge on selected file".

    That way, your merge driver script can call any merge tool you want.

    0 讨论(0)
提交回复
热议问题