From cf8e6ee452d5924bc91cc11a8cbdb73cd8475878 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Tue, 23 Jan 2024 13:40:29 +0100
Subject: [PATCH] Mark flake.lock as binary for merge conflicts

This makes git preserve the local version, but still mark the file as
conflicted, so it is not mangled with conflict regions.
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..3cf6008
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+/flake.lock merge=binary
\ No newline at end of file