Javanaut/ffx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prep 0.2.4

Browse Source
This commit is contained in:
Javanaut
2026-04-12 12:28:23 +02:00
parent fc9d94aeee
commit 2595bfe4f4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/merge_dev_into_main.sh
View File

@@ -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}'."