From 4dd72fdcb94f1f0eeb04d944423acff1614e75c8 Mon Sep 17 00:00:00 2001
From: electria <elec3137+git@proton.me>
Date: Sun, 26 Apr 2026 08:36:53 -0700
Subject: [PATCH] docs(defaults/git): add to comments

---
 defaults/git.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/defaults/git.nix b/defaults/git.nix
index 215e5ed..b90c35a 100644
--- a/defaults/git.nix
+++ b/defaults/git.nix
@@ -31,8 +31,13 @@ in
         credential.helper = "cache";
 
         push.autoSetupRemote = true;
+
+        # otherwise git suggests changing the config
+        # which two people I know have done without understanding
+        # causing further problems
         pull.ff = "only";
-        merge.conflictStyle = "zdiff3";
+
+        merge.conflictStyle = "zdiff3"; # easiest to understand style
         commit.verbose = true; # show diffs in commit editor
       }
       // (lib.optionalAttrs (superCfg.delta.enable && config.nixowos.allowAddingPackages) {