From 2595bfe4f47edfa602fa73433976091ae8acd10f Mon Sep 17 00:00:00 2001
From: Javanaut <javanaut@refulgent.de>
Date: Sun, 12 Apr 2026 12:28:23 +0200
Subject: [PATCH] prep 0.2.4

---
 tools/merge_dev_into_main.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/merge_dev_into_main.sh b/tools/merge_dev_into_main.sh
index 8301f68..0340a11 100755
--- a/tools/merge_dev_into_main.sh
+++ b/tools/merge_dev_into_main.sh
@@ -122,7 +122,7 @@ auto_resolve_cleanup_conflicts() {
         printf '  - %s\n' "${conflicted_path}"
     done
 
-    git rm -r --ignore-unmatch "${AGENT_DEVELOPMENT_PATHS[@]}" >/dev/null
+    git rm -r -f --ignore-unmatch "${AGENT_DEVELOPMENT_PATHS[@]}" >/dev/null
 
     mapfile -t remaining_conflicts < <(git diff --name-only --diff-filter=U)
     if [ "${#remaining_conflicts[@]}" -ne 0 ]; then
@@ -360,7 +360,7 @@ if ! git rev-parse -q --verify MERGE_HEAD >/dev/null 2>&1; then
 fi
 
 printf 'Removing agent-development files from %s...\n' "${MAIN_BRANCH}"
-git rm -r --ignore-unmatch "${AGENT_DEVELOPMENT_PATHS[@]}" >/dev/null
+git rm -r -f --ignore-unmatch "${AGENT_DEVELOPMENT_PATHS[@]}" >/dev/null
 
 if git diff --cached --quiet; then
     fail "No staged changes are present after merging '${DEV_BRANCH}' into '${MAIN_BRANCH}'."