resolve

/resolve — Context-Aware Conflict Resolution

Resolve merge conflicts on a given PR by understanding the intent of both sides of every conflict. For each conflicting hunk, the skill finds which PR on the base branch introduced those lines, reads that PR's description and diff, reads the current PR's description and diff, and resolves the conflict so no intentional functionality from either side is lost.

If a conflict is genuinely ambiguous — the skill cannot determine which side's change is intentional without human judgment — it stops and explains rather than guessing.

Arguments

• First positional argument: the GitHub PR number (required, e.g. /resolve 1490)
• Set PR_NUMBER from $ARGUMENTS (trim whitespace, strip leading #)

Validation:

PR_NUMBER=$(echo "${ARGUMENTS:-}" | tr -d '[:space:]#')
if ! echo "$PR_NUMBER" | grep -qE '^[0-9]+$'; then
  echo "ERROR: PR number must be a positive integer (got: '${ARGUMENTS:-<empty>}')"
  echo "Usage: /resolve <pr-number>  e.g. /resolve 1490"
  exit 1
fi
echo "Resolving conflicts on PR #$PR_NUMBER"

---

Phase 0 — Pre-flight

Verify required tools and environment before doing any real work.

for tool in git gh jq; do
  # > /dev/null 2>&1: suppress command path on success and "not found" message on failure — the || clause provides the error message
  command -v "$tool" > /dev/null 2>&1 || { echo "ERROR: required tool '$tool' not found in PATH"; exit 1; }
done
# > /dev/null 2>&1: suppress git's own "fatal: not a git repository" — our message is more actionable
git rev-parse --show-toplevel > /dev/null 2>&1 || { echo "ERROR: not in a git repository"; exit 1; }

# Validate PR number (re-parse here since Phase 0 is self-contained)
PR_NUMBER=$(echo "${ARGUMENTS:-}" | tr -d '[:space:]#')
if ! echo "$PR_NUMBER" | grep -qE '^[0-9]+$'; then
  echo "ERROR: PR number must be a positive integer (got: '${ARGUMENTS:-<empty>}')"
  exit 1
fi

# Guard against a previously aborted merge left in place — if MERGE_HEAD exists but
# .codegraph/resolve/ was already cleaned, the next `git merge` call would fail immediately.
if git rev-parse --verify MERGE_HEAD > /dev/null 2>&1; then
  echo "ERROR: An in-progress merge (MERGE_HEAD) already exists."
  echo "Run: git merge --abort && rm -rf .codegraph/resolve"
  echo "Then re-run /resolve $PR_NUMBER"
  exit 1
fi

# Detect repo slug dynamically so the skill works in any fork or renamed org
REPO=$(gh repo view --json nameWithOwner -q .nameWithOwner 2>/dev/null \
  || git remote get-url origin 2>/dev/null \
     | sed -nE 's#^(git@github\.com:|https://github\.com/|ssh://git@github\.com/)([^/]+/[^/]+)/?$#\2#p' \
     | sed -E 's/\.git$//')
if [ -z "$REPO" ]; then
  echo "ERROR: could not detect GitHub repo slug — ensure 'gh' is authenticated or 'origin' points to GitHub"
  exit 1
fi
echo "Detected repo: $REPO"

# Verify PR exists and is open
gh pr view "$PR_NUMBER" --repo "$REPO" --json number,state,headRefName,baseRefName \

  --jq '"PR #\(.number) [\(.state)] \(.headRefName) → \(.baseRefName)"' \
  || { echo "ERROR: PR #$PR_NUMBER not found or inaccessible"; exit 1; }