From 0260a1cec609a4995fecfc15faf864044d668c3c Mon Sep 17 00:00:00 2001
From: Victor <victor@xirion.net>
Date: Tue, 27 Jun 2023 11:23:25 +0200
Subject: [PATCH] invert meger strategy

---
 flake.lock                      | 6 +++---
 nixos/common/hm-modules/git.nix | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index 09680f8..2737626 100644
--- a/flake.lock
+++ b/flake.lock
@@ -665,11 +665,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1687847320,
-        "narHash": "sha256-/nISfR5SHOYWhpoMFp1LqXbRm1MuqY+gxUMggXM9HMk=",
+        "lastModified": 1687856573,
+        "narHash": "sha256-rzC+5rRsy92Dhjb1q5e5tDjdhRfL1z4WFWwlcD3a+4Q=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3bc1bc40121eb0975dc3d96741300bb4fd16be29",
+        "rev": "4c08f65ab5105a55eed3fc9003f3e6874b69fe13",
         "type": "github"
       },
       "original": {
diff --git a/nixos/common/hm-modules/git.nix b/nixos/common/hm-modules/git.nix
index 1237fcc..f7bb139 100644
--- a/nixos/common/hm-modules/git.nix
+++ b/nixos/common/hm-modules/git.nix
@@ -15,9 +15,9 @@ in {
         init.defaultBranch = "main";
         # Git merge driver that always grabs upstream changes
         # Useful for e.g. lock files
-        merge.theirs = {
-          name = "Keep Upstream Changes";
-          driver = "cp -f '%B' '%A'";
+        merge.ours = {
+          name = "Overwrite Upstream Changes";
+          driver = "cp -f '%A' '%B'";
         };
       };
 
@@ -25,7 +25,7 @@ in {
     };
 
     home.file.".config/git/attributes".text = ''
-      flake.lock merge=theirs
+      flake.lock merge=ours
     '';
   };
 }