From 745975409dd7e931ee71427a38c57c258926bd87 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Wed, 10 Nov 2021 09:28:27 -0500
Subject: [PATCH] meta: ignore flake.lock when merging in changes

---
 .gitattributes         | 1 +
 users/profiles/git.nix | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..660acec
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+flake.lock merge=ignore
diff --git a/users/profiles/git.nix b/users/profiles/git.nix
index 8e0a04f..ebb559b 100644
--- a/users/profiles/git.nix
+++ b/users/profiles/git.nix
@@ -4,6 +4,7 @@
 
     extraConfig = {
       pull.rebase = true;
+      merge.ignore.driver = "true";
     };
 
     aliases = {