updatesh

update.sh

@@ -59,6 +59,16 @@ fi
 # 2. Update Code dari Git (Main & Submodules)
 echo "[+] Pulling latest source code from repository..."
 GIT_PULL_FAILED=false
+
+# Cleanup stale untracked files that block merge (leftover from submodule removal)
+STALE_PATHS=("apps/device-agent-embedded")
+for stale_path in "${STALE_PATHS[@]}"; do
+    if [ -d "$stale_path" ] && ! git ls-files --error-unmatch "$stale_path" >/dev/null 2>&1; then
+        echo "[+] Removing stale untracked $stale_path/ (blocks merge)..."
+        rm -rf "$stale_path"
+    fi
+done
+
 git pull origin main || { GIT_PULL_FAILED=true; echo "[!] Git pull for main repo skipped or failed, continuing..."; }
 
 echo "[+] Syncing and updating submodules..."