chore: fast-forward merge workflow#581
Open
agentbridge-fixer[bot] wants to merge 1 commit into
Open
Conversation
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
catatafishen
force-pushed
the
chore/ff-merge-workflow
branch
from
May 12, 2026 08:51
8da82ce to
9e2d484
Compare
Adds a workflow_dispatch workflow that fast-forward merges a PR by
directly advancing the base branch ref via the GitHub REST API —
no merge commit, no squash, pure FF with original hashes preserved.
If the branch is behind master the workflow fails immediately with
the exact rebase command to run locally (preserving commit hashes
and any commit signatures).
Usage: Actions → Fast-Forward Merge → Run workflow → enter PR number.
After merging this PR, disable the other merge methods so FF merge
becomes the only way to merge:
gh api --method PATCH /repos/catatafishen/agentbridge \
-F allow_merge_commit=false \
-F allow_squash_merge=false \
-F allow_rebase_merge=false
All ${{ github.* }} and ${{ inputs.* }} template expressions that
appeared inline in run: shell blocks are now exposed via env: variables
to prevent code injection via template expansion (zizmor).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
catatafishen
force-pushed
the
chore/ff-merge-workflow
branch
from
May 25, 2026 09:10
9e2d484 to
86904e3
Compare
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Adds a
workflow_dispatchGitHub Actions workflow that fast-forward merges a PR by directly advancing the base branch ref via the GitHub REST API (no merge commit, no squash — pure FF).Usage (once merged)
Actions → Fast-Forward Merge → Run workflow → enter PR number
Or from the CLI:
The workflow:
/compare/{base}...{head}— fails with a clear message if the branch is behind master (needs rebase first)Blocking other merge methods (apply after merging this PR)
This removes GitHub's Merge/Squash/Rebase buttons from all future PRs, making the Actions workflow the only merge path.