From d6bd506e66a15b2150b49de668d09b931871d9d7 Mon Sep 17 00:00:00 2001
From: har0ke <dev@ohargens.de>
Date: Thu, 5 Oct 2023 21:07:33 +0200
Subject: [PATCH] Ask the user to merge changes if source and destination were
 out of sync

---
 .config/Code/User/settings.json | 2 +-
 install_dotfiles.sh             | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.config/Code/User/settings.json b/.config/Code/User/settings.json
index ab2c053..043461d 100644
--- a/.config/Code/User/settings.json
+++ b/.config/Code/User/settings.json
@@ -4,7 +4,7 @@
     "window.customMenuBarAltFocus": false,
     "window.titleBarStyle": "custom",
     "window.menuBarVisibility": "visible",
-    "workbench.colorTheme": "Default Light+",
+    "workbench.colorTheme": "papercolor-vscode-dark",
     "workbench.startupEditor": "none",
     "task.problemMatchers.neverPrompt": {
         "shell": true
diff --git a/install_dotfiles.sh b/install_dotfiles.sh
index 8d48930..5207ef4 100755
--- a/install_dotfiles.sh
+++ b/install_dotfiles.sh
@@ -105,6 +105,14 @@ function install() {
         fi
     fi
 
+    if [ -e "${dst}" ]; then
+        if command -v meld &> /dev/null
+        then
+            meld "${src}" "${dst}"
+        else
+            vim -d "${src}" "${dst}"
+        fi
+    fi
     backup_file "${dst}"
     echo "${dst} will now be linked."