erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Actions Projects 1 Releases Wiki Activity

Mark flake.lock as binary for merge conflicts

Browse source 
This makes git preserve the local version, but still mark the file as
conflicted, so it is not mangled with conflict regions.
This commit is contained in:
Erwin Boskma 2024-01-23 13:40:29 +01:00
parent 4a2702934b
commit cf8e6ee452
Signed by: erwin
SSH key fingerprint: SHA256:/Wk1WZdLg+vQHs3in9qq7PsIp8SMzwGSk/RLZ5zPuZk
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitattributes vendored Normal file
View file

@ -0,0 +1 @@
/flake.lock merge=binary