feat(stack): add common-mistakes and conflict-resolution to skill#1105
Open
feat(stack): add common-mistakes and conflict-resolution to skill#1105
Conversation
Add two new sections to the stack skill to reduce agent errors: - "Common Mistakes" table with wrong/right/why patterns for the 6 most frequent agent errors (git push, fix commits, manual PR edits, etc.) - "Conflict Resolution" guide for rebase conflict handling Also enhance the CRITICAL section to include `mergify stack list` as part of the pre-operation check, so agents assess stack state before acting. Change-Id: I5447c05aae8009c9e8f313a457e7e1fe440a98ef Claude-Session-Id: badc87ae-b63f-4c15-b841-406df2a103b6
Contributor
Merge ProtectionsYour pull request matches the following merge protections and will not be merged until they are valid. 🔴 👀 Review RequirementsThis rule is failing.
🔴 🔎 ReviewsThis 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
Updates the mergify stack skill documentation to reduce common agent workflow errors and provide guidance for resolving rebase conflicts.
Changes:
- Added a “Common Mistakes” table mapping frequent wrong actions to the correct
mergify stackworkflow. - Expanded the pre-commit “CRITICAL” check to include
mergify stack listto assess stack state before acting. - Added a “Conflict Resolution” section covering standard rebase conflict steps and recovery.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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 two new sections to the stack skill to reduce agent errors:
frequent agent errors (git push, fix commits, manual PR edits, etc.)
Also enhance the CRITICAL section to include
mergify stack listaspart of the pre-operation check, so agents assess stack state before
acting.