diff --git a/home/git/default.nix b/home/git/default.nix
index c3070e0f..40f12323 100644
--- a/home/git/default.nix
+++ b/home/git/default.nix
@@ -34,6 +34,7 @@
         settings = {
             os = {
                 editPreset = "nvim";
+                autoStageResolvedConflicts = false;
             };
         };
     };