fix(stack): refuse an amend at a rebase conflict pause#1730
Draft
JulianMaurin wants to merge 1 commit into
Draft
Conversation
Contributor
Author
|
This pull request is part of a Mergify stack:
|
JulianMaurin
temporarily deployed
to
func-tests-live
July 20, 2026 13:25 — with 
GitHub Actions
Inactive
GitHub Actions
Inactive
Contributor
Merge Protections🔴 2 of 7 protections blocking · waiting on 👀 reviews
🔴 👀 Review RequirementsWaiting for
This rule is failing.
🔴 🔎 ReviewsWaiting for
This rule is failing.
Show 5 satisfied protections🟢 ⛓️ Depends-On RequirementsRequirement based on the presence of
🟢 🤖 Continuous Integration
🟢 Enforce conventional commitMake sure that we follow https://www.conventionalcommits.org/en/v1.0.0/
🟢 📕 PR description
🟢 🚦 Auto-queueWhen all merge protections are satisfied, this pull request will be queued automatically. |
JulianMaurin
force-pushed
the
devs/JulianMaurin/improve-mergify-stack-skill/refuse-amend-rebase-conflict-pause--a59c6db0
branch
from
July 20, 2026 14:35
d575d5e to
baa7a73
Compare
JulianMaurin
force-pushed
the
devs/JulianMaurin/improve-mergify-stack-skill/carry-revision-note-onto-rewritten-commit--0e5503e0
branch
from
July 20, 2026 14:35
898bb48 to
4c82e38
Compare
JulianMaurin
had a problem deploying
to
func-tests-live
July 20, 2026 14:36 — with
GitHub Actions
Error
GitHub Actions
Error
Contributor
Author
Revision history
|
JulianMaurin
temporarily deployed
to
func-tests-live
July 20, 2026 14:36 — with
GitHub Actions
Inactive
GitHub Actions
Inactive
At a conflict the pick being replayed has not produced a commit yet, so HEAD is the last commit the rebase applied — the trunk tip when the bottom commit conflicted, otherwise an earlier commit of the stack. `git commit --amend` there rewrites that commit and stamps the work with its message and Change-Id, mapping it to the wrong pull request. The commit-msg hook now refuses it. A `stack edit` pause records its target in `rebase-merge/amend` and stays allowed, the sequencer's own commit during `git rebase --continue` never reaches this hook, and `--no-verify` overrides. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Change-Id: Ia59c6db0b1f8e729ea2142f00c1c56db94dd51d5
JulianMaurin
force-pushed
the
devs/JulianMaurin/improve-mergify-stack-skill/refuse-amend-rebase-conflict-pause--a59c6db0
branch
from
July 20, 2026 15:20
baa7a73 to
b361ce0
Compare
JulianMaurin
force-pushed
the
devs/JulianMaurin/improve-mergify-stack-skill/carry-revision-note-onto-rewritten-commit--0e5503e0
branch
from
July 20, 2026 15:20
4c82e38 to
39b4faa
Compare
JulianMaurin
had a problem deploying
to
func-tests-live
July 20, 2026 15:20 — with
GitHub Actions
Error
GitHub Actions
Error
JulianMaurin
temporarily deployed
to
func-tests-live
July 20, 2026 15:20 — with
GitHub Actions
Inactive
GitHub Actions
Inactive
Base automatically changed from
devs/JulianMaurin/improve-mergify-stack-skill/carry-revision-note-onto-rewritten-commit--0e5503e0
to
main
July 21, 2026 07:42
mergify
Bot
force-pushed
the
devs/JulianMaurin/improve-mergify-stack-skill/refuse-amend-rebase-conflict-pause--a59c6db0
branch
from
July 21, 2026 07:42
b361ce0 to
8f8fc68
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.
At a conflict the pick being replayed has not produced a commit yet, so
HEAD is the last commit the rebase applied — the trunk tip when the
bottom commit conflicted, otherwise an earlier commit of the stack.
git commit --amendthere rewrites that commit and stamps the work withits message and Change-Id, mapping it to the wrong pull request.
The commit-msg hook now refuses it. A
stack editpause records itstarget in
rebase-merge/amendand stays allowed, the sequencer's owncommit during
git rebase --continuenever reaches this hook, and--no-verifyoverrides.Co-Authored-By: Claude Opus 4.8 noreply@anthropic.com
Depends-On: #1729