From 22dc0efc112aab7cccac887151a9b47bf06cb1d7 Mon Sep 17 00:00:00 2001
From: Yann Herklotz <git@yannherklotz.com>
Date: Sun, 27 Feb 2022 18:29:45 +0000
Subject: Add better conflict resolution to git config

---
 git/.gitconfig | 6 ++++++
 install.sh     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/git/.gitconfig b/git/.gitconfig
index ea6c0eb..61ee177 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -16,3 +16,9 @@
 
 [commit]
 	gpgsign = true
+
+[merge]
+	conflictstyle = diff3
+
+[credential]
+	helper = store
diff --git a/install.sh b/install.sh
index 500c864..6ec1b3c 100755
--- a/install.sh
+++ b/install.sh
@@ -23,7 +23,7 @@ function print_help {
 
 function ln_configs {
   if [[ $FORCE -eq 1 ]]; then
-    rm -rI $2
+    rm -f $2
   fi
   ln $EXTRA_OPTS ${SCRIPT_DIR}/$1 $2
 }
-- 
cgit