repo-native-alignment: Skill for Claude Code

oh-conflict

Resolve merge conflicts on a pull request. Work in an isolated worktree, merge the base branch into the PR head, resolve conflicts with understanding of both sides' intent, verify, and push.

Invocation

/oh-conflict <pr-number>

• <pr-number> - the pull request number with merge conflicts

Prerequisites

• Repo context: Run from the repo root where the PR exists
• GitHub issue PR: The PR should be from an oh-task session (branch issue/<number>)

Flow

1. Load project background from AGENTS.md, relevant .oh/ artifacts, and RNA MCP context when available.

2. Get PR branch info:

   # Save original directory for cleanup
   ORIGINAL_DIR=$(pwd)
   
   # Get head and base branch names
   PR_INFO=$(gh pr view <pr-number> --json headRefName,baseRefName)
   BRANCH=$(echo "$PR_INFO" | jq -r .headRefName)
   BASE=$(echo "$PR_INFO" | jq -r .baseRefName)
   

3. Create worktree and set up:

   git fetch origin
   git worktree add .worktrees/conflict-<pr-number> -B $BRANCH origin/$BRANCH
   cd .worktrees/conflict-<pr-number>
   

4. Understand the PR's intent before merging:

   # Read the linked issue to understand what this PR is trying to do
   PARENT_ISSUE=${BRANCH#issue/}
   gh issue view $PARENT_ISSUE
   
   # See the PR's own changes (what this branch introduced)
   git log --oneline origin/$BASE..$BRANCH
   git diff origin/$BASE...$BRANCH --stat
   

5. Attempt the merge:

   git merge origin/$BASE --no-edit
   

   This will fail with conflict markers in affected files.

6. Resolve conflicts file by file:

   • For each conflicted file, read both sides:

     git diff --name-only --diff-filter=U  # List conflicted files
     

   • Understand the intent of BOTH sides:

     • Ours (HEAD/PR branch): What did this PR change and why?
     • Theirs (base branch): What changed on base since this PR branched?

   • Resolve by preserving the intent of both sides

   • If the PR's changes are superseded by base, accept theirs

   • If both sides changed the same logic, merge the intents

   • Stage each resolved file: git add <file>