What problem does it solve? Restacking a Graphite stack often stops repeatedly on merge conflicts, forcing tedious manual resolution at every branch. This Skill drives the restack semi-autonomously: it resolves mechanically-safe conflicts through delegated subagents and escalates only genuinely ambiguous ones to the user. ## Core Features & Use Cases - Scoped restacking: Defaults to downstack (ancestors + current branch) and only runs a full-stack restack on explicit request, protecting upstack branches from unexpected rewrites. - Delegated conflict resolution: Each conflict stop is handled by a fresh subagent following a merge-conflict engine, with verified project checks before running gt continue. - Structured escalation: Ambiguous conflicts return a structured payload (both sides, intent diff, proposed resolution) so the user decides, then a follow-up subagent applies the decision. - Use Case: After rebasing trunk, run an intelligent restack of your current Graphite stack; safe formatting or mechanical conflicts resolve automatically while a genuine logic conflict pauses for your decision. ## Quick Start Ask the agent to restack my current Graphite stack and resolve any conflicts that come up.
