git/list[1] front-page[2] threads[3] people[4] search[5] about
 

File resolution on Windows in gitk

From
GGermain <germain.lechapelain@lanvaux.fr>
Date
Mar 29, 2024, 00:23 UTC
Message-ID
<20240328172330.7fe89edb6efb59b99085da0b@lanvaux.fr>
Hi there!
I am a big fan of 
 . Windows
 , Git
 . Resolving conflicts (in no particular order.)
I find the out-of-the-box experience of resolving conflicts to be a disaster on Windows:
 o P4Merge doesn't install for me
 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.)

I can have a look on my side, Sorry to complain I realize those two issues are certainly within there respective other software packages (I complained separately to Helix.)

But I had most fine `WinMerge' installed and redo to go.  And I understand this software is `the thing' for file comparison under MS Windows®.
Oh and also, I had to add the path to `Meld' in my `PATH' environment variable. :'(.

Arrivederci! Hope everyone is having a blast aside from that Kindest regards,

-- 
Germain <germain.lechapelain@lanvaux.fr>
Message 1 of 1 in “File resolution on Windows in gitk”
  1. GermainMar 29, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.