highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-04-06 05:37:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

guix: doc: zdiff3 doesn't work

Browse Source
This commit is contained in:
David Gumberg
2025-05-07 14:55:45 -07:00
parent ea1be38677
commit e76e886581
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/guix/INSTALL.md
View File

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