feat(stack): add mergify stack drop command#1383
Merged
mergify[bot] merged 1 commit intoMay 11, 2026
Merged
Conversation
Contributor
Merge ProtectionsYour pull request matches the following merge protections and will not be merged until they are valid. 🟢 🤖 Continuous IntegrationWonderful, this rule succeeded.
🟢 👀 Review RequirementsWonderful, this rule succeeded.
🟢 Enforce conventional commitWonderful, this rule succeeded.Make sure that we follow https://www.conventionalcommits.org/en/v1.0.0/
🟢 🔎 ReviewsWonderful, this rule succeeded.
🟢 📕 PR descriptionWonderful, this rule succeeded.
|
There was a problem hiding this comment.
Pull request overview
Adds a new mergify stack drop subcommand to remove one or more commits from the current stack via a single non-interactive scripted rebase, along with tests and user-facing documentation updates.
Changes:
- Introduce
stack_drop()implementation that marks selected stack commits asdropin the rebase todo. - Wire the new
dropcommand into themergify stackCLI (with--dry-runsupport). - Add a dedicated test suite covering dropping first/middle/last/multiple commits, Change-Id matching, and error cases; document the new command in the stack skill doc.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| skills/mergify-stack/SKILL.md | Documents the new mergify stack drop workflow and examples. |
| mergify_cli/tests/stack/test_drop.py | Adds end-to-end tests for stack drop behaviors and error handling. |
| mergify_cli/stack/drop.py | Implements the drop logic using existing stack/rebase helpers. |
| mergify_cli/stack/cli.py | Exposes mergify stack drop via Click and connects it to the implementation. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
JulianMaurin
previously approved these changes
May 11, 2026
Contributor
|
@jd this pull request is now in conflict 😩 |
Member
Author
Revision history
|
jd
force-pushed
the
devs/jd/feat/stack-drop/add-mergify-stack-drop-cmd--27bd94a9
branch
from
f3023d3 to
1d45cfe
Compare
mergify
Bot
dismissed
JulianMaurin’s stale review
Pull request has been modified.
kozlek
previously approved these changes
May 11, 2026
Contributor
|
@jd this pull request is now in conflict 😩 |
Add "mergify stack drop COMMIT..." which removes one or more commits from the stack in a single non-interactive rebase, replacing the brittle "GIT_SEQUENCE_EDITOR='sed -i ... pick → drop' git rebase -i" recipe agents tend to reach for. Multiple commits can be listed (matched by SHA or Change-Id prefix); unlike fixup, dropping the first commit in the stack is fine. Errors on unknown or duplicated prefixes. Supports --dry-run. Also documents the drop command in skills/mergify-stack/SKILL.md. Change-Id: I27bd94a961af67e8f53af2927591d59e4363c1cd
jd
force-pushed
the
devs/jd/feat/stack-drop/add-mergify-stack-drop-cmd--27bd94a9
branch
from
1d45cfe to
28ef370
Compare
JulianMaurin
approved these changes
May 11, 2026
kozlek
approved these changes
May 11, 2026
Contributor
Merge Queue Status
This pull request spent 23 seconds in the queue, including 6 seconds running CI. Required conditions to merge
|
mergify
Bot
deleted the
devs/jd/feat/stack-drop/add-mergify-stack-drop-cmd--27bd94a9
branch
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
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.
Add "mergify stack drop COMMIT..." which removes one or more commits
from the stack in a single non-interactive rebase, replacing the
brittle "GIT_SEQUENCE_EDITOR='sed -i ... pick → drop' git rebase -i"
recipe agents tend to reach for.
Multiple commits can be listed (matched by SHA or Change-Id prefix);
unlike fixup, dropping the first commit in the stack is fine. Errors
on unknown or duplicated prefixes. Supports --dry-run.
Also documents the drop command in skills/mergify-stack/SKILL.md.