resolve-conflicts

Resolve Conflicts: Agent-Assisted Conflict Resolution

Analyzes git merge or rebase conflicts, classifies them by complexity, auto-resolves trivial cases, and presents non-trivial resolutions for human approval.

Invocation

Automatic (called by other skills):

• /dso:end-session Step 4: when merge-to-main.sh exits with CONFLICT_DATA: output
• /dso:debug-everything Phase L Step 1: same trigger

Manual (user-invoked):

• /dso:resolve-conflicts — resolve conflicts in the current merge/rebase state
• /dso:resolve-conflicts <branch> — attempt merge of <branch> into current branch, then resolve

Prerequisites

Before this skill can act, one of these must be true:

• A merge is in progress with unresolved conflicts (ms_get_conflicted_files returns files)
• A branch name was provided as argument (skill will attempt the merge)

Steps

1. Detect Conflicts

REPO_ROOT=$(git rev-parse --show-toplevel)
source "${CLAUDE_PLUGIN_ROOT}/hooks/lib/merge-state.sh"

If a branch argument was provided and no merge is in progress:

git merge --no-ff <branch> -m "Merge <branch>" --quiet 2>&1

Check for conflicted files using the shared library:

CONFLICTED=$(ms_get_conflicted_files)

If $CONFLICTED is empty, check whether a merge is still in progress with all conflicts pre-resolved:

# Uses ms_is_merge_in_progress from ${CLAUDE_PLUGIN_ROOT}/hooks/lib/merge-state.sh
# Returns 0 (true) when MERGE_HEAD exists and != HEAD
if ms_is_merge_in_progress; then MERGE_IN_PROGRESS="yes"; else MERGE_IN_PROGRESS="no"; fi

• If $MERGE_IN_PROGRESS is yes and no unresolved conflicts remain: report "Merge in progress with all conflicts pre-resolved — run git commit to finalize the merge." and exit. Do NOT report "no conflicts detected" — the merge needs committing, not aborting.
• If $MERGE_IN_PROGRESS is no: report "No conflicts detected — merge is clean." and exit.