Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Git running Meld as merge tool fails 'check_requirements import gi'

Tags:

git

qt

meld

Error while trying to merge conflicting files: Error while trying to merge conflicting files

As version control I use git and I call Meld in order to merge conflicting files. (As IDE I use Qt creator, but I do not think it can be the problem). I do not understand why the merge procedure fails, because different times this procedure was used in order to merge the projects (the remote and the local one).

like image 901
Sara Avatar asked Mar 12 '19 14:03

Sara


People also ask

What is meld in git?

Meld is a visual diff tool that makes it easier to compare and merge changes in files, directories, Git repos, and more.

How configure git Difftool Ubuntu?

Instead of running one of the known diff tools, git difftool can be customized to run an alternative program by specifying the command line to invoke in a configuration variable difftool. <tool>. cmd. When git difftool is invoked with this tool (either through the -t or --tool option or the diff.


1 Answers

The gi module runs, except it fails to find the GTK DLL:

---------------------------
cx_Freeze: Python error in main script
---------------------------
Traceback (most recent call last):
  File "bin/meld", line 205, in check_requirements
    import gi
  File "C:/msys64/MINGW32/lib/python3.7/site-packages/gi/__init__.py", line 42, in <module>
  File "ExtensionLoader_gi__gi.py", line 23, in <module>
  File "ExtensionLoader_gi__gi.py", line 15, in __bootstrap__
  File "C:/msys64/MINGW32/lib/python3.7/imp.py", line 342, in load_dynamic
ImportError: DLL load failed: The specified module could not be found.

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "C:/msys64/MINGW32/lib/python3.7/site-packages\cx_Freeze/initscripts/__startup__.py", line 14, in run
  File "C:/msys64/MINGW32/lib/python3.7/site-packages\cx_Freeze/initscripts/Console.py", line 26, in run
  File "bin/meld", line 362, in <module>
    check_requirements()
  File "bin/meld", line 211, in check_requirements
    missing_reqs("GTK+", gtk_requirement, e)
  File "bin/meld", line 194, in missing_reqs
    show_error_and_exit(_("Cannot import: ") + mod + "\n" + str(exc))
  File "bin/meld", line 182, in show_error_and_exit
    raise Exception(error_text)
Exception: Cannot import: GTK+
DLL load failed: The specified module could not be found.

---------------------------
OK   
---------------------------

I've added C:\Program Files (x86)\Meld\lib to my Path user environment variable, and now Meld works fine.

like image 177
Cees Timmerman Avatar answered Nov 15 '22 00:11

Cees Timmerman