From e76e8865818dc5369fd4e31e09c3d3103a6b75f8 Mon Sep 17 00:00:00 2001 From: David Gumberg Date: Wed, 7 May 2025 14:55:45 -0700 Subject: [PATCH] guix: doc: zdiff3 doesn't work --- contrib/guix/INSTALL.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/contrib/guix/INSTALL.md b/contrib/guix/INSTALL.md index 6320d971951..812761dc5a8 100644 --- a/contrib/guix/INSTALL.md +++ b/contrib/guix/INSTALL.md @@ -763,6 +763,21 @@ Please see the following links for more details: - A commit to skip this test in Guix has been merged into the core-updates branch: [savannah/guix@6ba1058](https://git.savannah.gnu.org/cgit/guix.git/commit/?id=6ba1058df0c4ce5611c2367531ae5c3cdc729ab4) +## zdiff3 + +[Currently](https://issues.guix.gnu.org/72942) `guix` builds may fail if the +global git config has `merge.conflictstyle` set to `zdiff3` as follows: + +``` +Updating channel 'guix' from Git repository at 'https://codeberg.org/guix/guix.git'... +guix time-machine: error: Git error: unknown style 'zdiff3' given for 'merge.conflictstyle' +``` + +This can be fixed by setting `merge.conflictstyle` to `diff3`: + +```bash +git config --global merge.conflictstyle diff3 +``` [install-script]: #options-1-and-2-using-the-official-shell-installer-script-or-binary-tarball [install-bin-tarball]: #options-1-and-2-using-the-official-shell-installer-script-or-binary-tarball