search

yousseb / meld

Meld for macOS
https://yousseb.github.io/meld/
GNU General Public License v2.0
2.27k stars 120 forks source link

"file not found Continue merging other unresolved paths (y/n)" for every file #138

Closed GrigoriiTarasov closed 6 months ago

GrigoriiTarasov commented 1 year ago

Platform:

Ubuntu 20

How replicate:

git config --global merge.tool meld
git mergetool

Than for every file I see

file not found 
Continue merging other unresolved paths (y/n)

And merge stays unresolved

If meld is set in like https://stackoverflow.com/a/51368698/7607734 getting This message is displayed because 'merge.tool' is not configured.

numist commented 6 months ago

Are you actually on Ubuntu? Because this repository is specific to the macOS port; the main project is hosted by GNOME.

Either way, the error This message is displayed because 'merge.tool' is not configured. is because you also need the following in your gitconfig:

[merge]
    tool = meld

But if you really are on Ubuntu that won't help you because the Stack Overflow answer you linked is specific to macOS—the open command is not available on Ubuntu.

GrigoriiTarasov commented 6 months ago

Oh, sorry, thank you, I appreciate your help.