all repos — nixfiles @ e9d62e56f73a1ecc772073ab3ce2705abf153028

System and user configuration, managed by nix and home-manager

git: don't give me advice about merge conflicts
Alan Pearce alan@alanpearce.eu
Tue, 18 Jun 2024 20:28:44 +0200
commit

e9d62e56f73a1ecc772073ab3ce2705abf153028

parent

bd10447989c1695323e33c75bdbd9dd4ebcbd8aa

1 files changed, 1 insertions(+), 0 deletions(-)

jump to
M user/settings/git.nix → user/settings/git.nix
@@ -19,6 +19,7 @@ defaultBranch = "main";       };
       advice = {
         addEmptyPathspec = false;
+        mergeConflict = false;
       };
       ghq = {
         root = "${config.home.homeDirectory}/projects";