How to merge all files manually in Git?

后端 未结 7 2037
遥遥无期
遥遥无期 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 01:57

    I had a scenario where:

    git merge --no-commit merge_branch 
    

    just caused a Fast Forward.

    If this happens you can use:

    git merge --no-commit --no-ff merge_branch
    

    and then you'll be able to review your changes

提交回复
热议问题