docs(skill): document mergify stack edit for mid-stack amends#1385
Open
docs(skill): document mergify stack edit for mid-stack amends#1385
Conversation
Contributor
Merge ProtectionsYour pull request matches the following merge protections and will not be merged until they are valid. 🔴 👀 Review RequirementsWaiting for
This rule is failing.
🔴 🔎 ReviewsWaiting for
This rule is failing.
🟢 🤖 Continuous IntegrationWonderful, this rule succeeded.
🟢 Enforce conventional commitWonderful, this rule succeeded.Make sure that we follow https://www.conventionalcommits.org/en/v1.0.0/
🟢 📕 PR descriptionWonderful, this rule succeeded.
|
There was a problem hiding this comment.
Pull request overview
This PR updates the mergify-stack skill documentation to recommend mergify stack edit <commit> for mid-stack amends instead of git rebase -i, making the workflow non-interactive and suitable for agent/LLM sessions.
Changes:
- Replaces the “Mid-stack fixes” guidance from
git rebase -itomergify stack edit <commit>+ amend + continue. - Adds “Common Mistakes” entries discouraging both
git rebase -ifor mid-stack amends andGIT_SEQUENCE_EDITOR=... git rebase -iworkarounds. - Adds
mergify stack editto the command list and updates the worktree-modifying-operations checklist accordingly.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
The "Mid-stack fixes" recipe in the mergify-stack skill pointed at `git rebase -i`, which is unactionable in agent contexts (no interactive editor). The repo already ships `mergify stack edit <SHA>` which does exactly the non-interactive `pick → edit` rebase the agent needed — agents have been reinventing it as `GIT_SEQUENCE_EDITOR='sed -i ... pick → edit' git rebase -i` because the skill never named the command. Update the Core Conventions bullet, add Common Mistakes rows for both the edit case and the broader `GIT_SEQUENCE_EDITOR` antipattern, list `mergify stack edit X` in the Commands block, and swap the worktree-modifying-operations checklist from `git rebase -i` to `mergify stack edit`. Change-Id: I668a381e83b594e36c8f2e8e7ed880e83aab9d56
jd
force-pushed
the
devs/jd/docs/stack-skill-edit/document-mergify-stack-edit-mid-stack-amends--668a381e
branch
from
d1219d9 to
ac79039
Compare
Member
Author
Revision history
|
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.
The "Mid-stack fixes" recipe in the mergify-stack skill pointed at
git rebase -i, which is unactionable in agent contexts (nointeractive editor). The repo already ships
mergify stack edit <SHA>which does exactly the non-interactive
pick → editrebase the agentneeded — agents have been reinventing it as
GIT_SEQUENCE_EDITOR='sed -i ... pick → edit' git rebase -ibecausethe skill never named the command.
Update the Core Conventions bullet, add Common Mistakes rows for both
the edit case and the broader
GIT_SEQUENCE_EDITORantipattern, listmergify stack edit Xin the Commands block, and swap theworktree-modifying-operations checklist from
git rebase -itomergify stack edit.