From: Germain <germain.lechapelain@lanvaux.fr>
To: git@vger.kernel.org
Subject: File resolution on Windows in gitk
Date: Thu, 28 Mar 2024 17:23:30 -0700 [thread overview]
Message-ID: <20240328172330.7fe89edb6efb59b99085da0b@lanvaux.fr> (raw)
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>
reply other threads:[~2024-03-29 0:33 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240328172330.7fe89edb6efb59b99085da0b@lanvaux.fr \
--to=germain.lechapelain@lanvaux.fr \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).