resolve-merge-conflicts
Installation
SKILL.md
Step 1 — Detect the base branch
A stack PR targets another feature branch, not main. Merging main when the PR is stacked leaves GitHub conflicts unchanged.
From the repo root, identify the base:
gh stack view
If the current branch has an open PR, confirm the base:
gh pr view --json baseRefName,mergeable,mergeStateStatus
baseRefNameis notmain→ stacked. The base is that branch (the parent PR below this one ingh stack view).- No PR, or
baseRefNameismain→ base ismain.