What the developer wrote
Authored by David Gumberg
guix: doc: zdiff3 doesn't work
What changed, and why it matters
This commit only adds documentation to a Guix installation guide. It explains that a specific Git setting called 'zdiff3' can cause Guix builds to fail, and tells users how to switch to a compatible setting. There is no code change and no security issue.
No security action needed. This is a documentation-only commit. Users building with Guix may optionally follow the documented workaround if they encounter the build failure.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The patch appends a new ‘zdiff3’ section to contrib/guix/INSTALL.md. It documents a known upstream Guix issue (https://issues.guix.gnu.org/72942) where Guix’s embedded Git/libgit2 does not recognize the ‘zdiff3’ merge.conflictstyle value, causing ‘guix time-machine’ to error. The fix is a user-side git config change to ‘diff3’. No Bitcoin Core source code, build scripts, or cryptographic logic is modified.
Changed components
contrib/guix/INSTALL.mdInspect captured patch +15 / −0
diff --git a/contrib/guix/INSTALL.md b/contrib/guix/INSTALL.md
index 6320d971..812761dc 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
Why this scored 15/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.