Skip to content

fix(backflow): stop the App from stamping the human merge ack #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RevealUIStudio merged 1 commit into from
Sep 22, 2026
+6 −6
Merged

fix(backflow): stop the App from stamping the human merge ack #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/backflow-reusable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,12 +308,12 @@ jobs:
exit 1
fi

gh label create "backflow:merge-commit" --repo "$REPO" --color 0e8a16 \
--description "Backflow PR: merge commit only (never squash)" \
2>/dev/null || true
gh pr edit "$prnum" --repo "$REPO" --add-label "backflow:merge-commit" \
2>/tmp/label-err.txt \
|| echo "::warning::Could not add backflow:merge-commit to #$prnum ($(cat /tmp/label-err.txt))"
# Do not apply backflow:merge-commit. That label is a human acknowledgment
# ("I will merge with a merge commit, not squash"). The App stamping it
# would forge the ack. The caller's merge-method guard passes this PR
# when the author is revfleet-backflow[bot] and the head is
# chore/backflow-main-into-test. Hand-rolled backflows still need the
# label. Ancestry mode still fails a squash after the fact.

# Enable auto-merge with MERGE only (never squash/rebase).
# Requires repo allow_auto_merge=true. Failure is a warning; body still documents --merge.
Expand Down
Loading