{"thread":{"id":"61222","subject":"File resolution on Windows in gitk","startedAt":"2024-03-29T00:33:07Z","lastAt":"2024-03-29T00:33:07Z","messageCount":1,"participants":["Germain"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"491796","messageId":"20240328172330.7fe89edb6efb59b99085da0b@lanvaux.fr","threadId":"61222","inReplyTo":null,"subject":"File resolution on Windows in gitk","fromName":"Germain","fromEmail":"germain.lechapelain@lanvaux.fr","sentAt":"2024-03-29T00:23:30Z","receivedAt":"2024-03-29T00:33:07Z","isPatch":false,"sender":{"key":"germain.lechapelain@lanvaux.fr","avatar":null},"body":"Hi there!\n\nI am a big fan of \n . Windows\n , Git\n . Resolving conflicts (in no particular order.)\n\nI find the out-of-the-box experience of resolving conflicts to be a disaster on Windows:\n\n o P4Merge doesn't install for me\n o Meld worked (seemingly so far.)  But I do get a big fat error from `gdbus.exe' (whatever this is:) `Procedure DllMain not found in something-libMeld' (from my recollection.)\n\nI can have a look on my side,\nSorry to complain I realize those two issues are certainly within there respective other software packages (I complained separately to Helix.)\n\nBut I had most fine `WinMerge' installed and redo to go.  And I understand this software is `the thing' for file comparison under MS Windows®.\n\nOh and also, I had to add the path to `Meld' in my `PATH' environment variable. :'(.\n\nArrivederci!\nHope everyone is having a blast aside from that\nKindest regards,\n-- \nGermain <germain.lechapelain@lanvaux.fr>\n"}]}