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
  • baseRefName is not mainstacked. The base is that branch (the parent PR below this one in gh stack view).
  • No PR, or baseRefName is main → base is main.
Installs
33
First Seen
Jun 24, 2026
resolve-merge-conflicts — jasonharmongit/skills