Changes to the variables

sync-project.sh

@@ -153,9 +153,11 @@ echo -e "${GREEN}.vscode/sftp.json created successfully${NC}"
 
 # Go through scripts, add variables and add them to project folder
 if [ "$SFTP_ONLY" = true ]; then
+	# Sftp only scripts
     scripts=("local-remote.sh" "remote-local.sh" "sftp-watch.sh" "ssh.sh")
 else
-    scripts=("watch-build.sh" "local-remote.sh" "remote-local.sh" "sftp-watch.sh" "ssh.sh")
+	# All scripts
+    scripts=("watch-build.sh" "local-remote.sh" "remote-local.sh" "sftp-watch.sh" "ssh.sh" "split-conflicts.sh")
 fi
 
 for script in "${scripts[@]}"; do
@@ -169,6 +171,7 @@ for script in "${scripts[@]}"; do
     SERVER_HOST=\"${HOST}\"
     SERVER_PASSWORD=\"${SSH_PASSWORD}\"
     SERVER_PATH=\"${SERVER_PROJECT_PATH}/\"
+    REMOTE_PROGRESS=\".remote-in-progress\"
     " > "${script}"
 
     # Append the rest of the upload core build script