resolve

Resolve Merge Conflicts

4-phase EXPLORE > PLAN > CODE > VERIFY workflow for merge conflict resolution.

Required Skills

• merge-conflict-resolution — conflict detection, classification, and resolution strategies
• capability-discovery — discover build/test/lint commands
• debugging-patterns — on-demand if resolution breaks the build

References

• references/escalation-format.md — canonical six-field structure used by the max-conflict-files escalation (Phase 1) and any semantic/structural/delete-modify escalation surfaced during resolution

Phase 0: Pre-Flight

Determine invocation mode from $ARGUMENTS:

1. No args + active conflict markers → resolve in-progress merge/rebase
2. PR number → fetch PR, attempt merge against base, resolve conflicts
3. Branch name → resolve conflicts for that branch against default branch

Validation

# Take the first whitespace-separated token; accept only if it matches the
# safe set [a-zA-Z0-9._/-] (covers digit-only PR numbers AND typical branch
# names like `feature/foo-bar.v2`). A token containing shell metacharacters
# (`;`, `|`, `$`, spaces, etc.) is rejected with empty RESOLVE_TARGET so the
# trailing context can't reach downstream shell. Trailing prose after the
# first whitespace is fine.
#
# Output: `###`-headed sections + KEY=value per
# `references/command-output-format.md`.
_RAW="$ARGUMENTS"  # Claude Code substitutes the bare arg token, not bash parameter-expansion
ARG1="${_RAW%% *}"
case "$ARG1" in
  ''|*[!a-zA-Z0-9._/-]*) RESOLVE_TARGET="" ;;
  *) RESOLVE_TARGET="$ARG1" ;;
esac

echo "### Resolve Mode"
# Quote parenthesized fallback per command-output-format.md rule 2.
echo "RESOLVE_TARGET=${RESOLVE_TARGET:-\"(none — in-progress merge mode)\"}"
if [ -f .git/MERGE_HEAD ] || [ -d .git/rebase-merge ] || [ -d .git/rebase-apply ]; then
  echo "CONFLICT_STATE=active"
else
  echo "CONFLICT_STATE=inactive"
fi

true