feat: add restack skill to guide through git restack conflicts #354
Conversation
|
Merge activity
|
How to use the Graphite Merge QueueAdd either label to this PR to merge it via the merge queue:
You must have a Graphite account in order to use the merge queue. Sign up using this link. An organization admin has enabled the Graphite Merge Queue in this repository. Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue. This stack of pull requests is managed by Graphite. Learn more about stacking. |
# Add Restack Skill for Guided Conflict Resolution This PR adds a new Claude skill for handling "gt restack" operations and resolving conflicts. The skill provides a structured workflow to: 1. Detect whether a restack is already in progress or needs to be initiated 2. Intelligently diagnose conflict types (simple lockfile-only vs. complex multi-file) 3. Guide users through appropriate resolution strategies with clear explanations 4. Handle broken lockfile scenarios with targeted remediation 5. Provide contextual recommendations for when to use `--ours` vs `--theirs` The skill includes a comprehensive workflow that loops until restack completes successfully, with specific commands and diagnostics for each step. It uses AskUserQuestion for confirmations and resolution choices, making the experience interactive and educational.
|
View your CI Pipeline Execution ↗ for commit fda0a23
☁️ Nx Cloud last updated this comment at |
🔍 Preview Deployment: Website✅ Deployment successful! 🔗 Preview URL: https://pr-354.pgflow.pages.dev 📝 Details:
_Last updated: _ |
![graphite-app[bot]](https://avatars.githubusercontent.com/in/158384?s=60&v=4){kind=small}
| git diff <file> | ||
| ``` | ||
|
|
||
| ### 3. Explain Conflict Type |
There was a problem hiding this comment.
Duplicate step number causes workflow confusion. This is labeled as "3. Explain Conflict Type" but should be "4. Explain Conflict Type". The workflow already has "3. Gather Diagnostics" at line 43. This numbering error cascades through the rest of the document:
### 4. Explain Conflict Type (currently shows as 3)
### 5. Resolve Based on Type (currently shows as 4)
### 6. Handle Broken Lockfile (currently shows as 5)
### 7. Success & Reminder (currently correct as 6)This breaks the internal references at lines 30, 41, 89, 133, 152 which correctly refer to "step 3 (Gather Diagnostics)" and lines 90, 134, 153 which correctly refer to "step 6 (Success & Reminder)" - but the actual step headers are misnumbered.
Spotted by Graphite Agent
Is this helpful? React 👍 or 👎 to let us know.
Add Restack Skill for Guided Conflict Resolution
This PR adds a new Claude skill for handling "gt restack" operations and resolving conflicts. The skill provides a structured workflow to:
--oursvs--theirsThe skill includes a comprehensive workflow that loops until restack completes successfully, with specific commands and diagnostics for each step. It uses AskUserQuestion for confirmations and resolution choices, making the experience interactive and educational.