Geek Answers Handbook

Why does git mergetool say "No files need merging"?

I am trying to configure BeyondCompare4 as my diffftool and mergetool in git. I am using git version 2.5.0.windows.1. So far, BeyondCompare4 works just fine like diffftool, but not like mergetool.

From my main branch I start git mergetool branch3and respondNo files need merging

But when I run git diff branch3, I see several types of differences in one file (often on one line). And if I just started git merge branch3, it will start the merge process and stop with CONFLICT. So why does it git mergetoolwork for me in the same way?

This link suggested git config --global core.trustctime falsethat I tried with no luck: git mergetool reports "No need to merge files

This link suggested that reerre might be a problem, so I tried git config --global rerere.enabled falsealso out of luck: git tells me that I am merging the conflict, but also tells me that the files do not need merging

Here is what my .gitconfig looks like:

[diff]
    tool = bc
[difftool]


    prompt = false
[difftool "bc"]
    trustExitCode = true
    cmd = 'c:/program files (x86)/beyond compare 4/bcomp.exe' $LOCAL $REMOTE


[merge]
    tool = bc
[mergetool]
     prompt = false
[mergetool "bc"]
    trustExitCode = true
    cmd = 'c:/program files (x86)/beyond compare 4/bcomp.exe' $LOCAL $REMOTE $BASE $MERGED

I even tried modifying .gitconfig to change the path of bcomp4.exe to something dummy to see if I could get an error. If I make changes to diffftool, I get errors that the system does not find the path. But if I change it to mergetool, it just says: “No files need to be merged”, which makes me believe that BeyondCompare4 does not even work.

Thanks for any ideas why it git mergetoolstops early with this post.

+4
source share
1 answer

git mergetool, , , .

git checkout master
git merge branch3
# the merge reports conflicts which we need to resolve
git mergetool
git add -u
git commit -m "a merge commit message"

meregetool https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging#Basic-Merge-Conflicts

git help mergetool .

+2

More articles:


All Articles