Git Conflict Resolution Workflow (git-conflict-resolve)

Overview

A semantics-driven Git conflict resolution protocol that replaces blind -X ours/-X theirs strategies.

For each conflicted file: first run a semantic analysis to understand both sides' intent, then derive a resolution rule (with a confidence level). High-confidence conflicts are resolved automatically; medium-confidence conflicts show a recommendation and wait for confirmation; low-confidence conflicts show a three-way view and wait for a manual decision. After resolution, each file is logically verified one by one, and a final manual-review checklist is generated.

Paired skill: invoked by git-release-finish stage 6; can also be invoked standalone to handle any merge/rebase conflict.

Input Parameters