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@xxxxxxxxxx>