How to merge all files manually in Git?

后端 未结 7 2025
遥遥无期
遥遥无期 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:04

    A similar question is How to prevent an automerge using git?

    FractalSpace gave an answer which I think useful:

    $ git checkout master
    $ git difftool -t kdiff3 local-branch HEAD
    

    The idea is using difftools instead of auto-merging tools to manually pick what you need and create new files.

提交回复
热议问题