Ask the user to merge changes if source and destination were out of sync

.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

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."