1 files changed, 1 insertions, 0 deletions
diff --git a/user/settings/git.nix b/user/settings/git.nix
index 4726120c..463b5645 100644
--- a/user/settings/git.nix
+++ b/user/settings/git.nix
@@ -19,6 +19,7 @@
       };
       advice = {
         addEmptyPathspec = false;
+        mergeConflict = false;
       };
       ghq = {
         root = "${config.home.homeDirectory}/projects";