What problem does it solve? Blindly accepting one side of a git conflict with --theirs or --ours silently drops real fixes and features. This Skill forces you to understand both sides' intent before resolving, so no committed work vanishes during a merge or rebase. ## Core Features & Use Cases - Intent-traced resolution: Trace each conflicting hunk to its source via git log, blame, or PRs before touching it, citing evidence rather than guessing from the diff. - Conflict-class menu: Apply the right move per hunk type — regenerate lockfiles, let the formatter decide whitespace clashes, union independent edits, and pick by merge goal only for truly incompatible logic. - Rebase inversion guard: Catch the trap where --ours/--theirs swap meaning during a rebase, preventing accidental reverts of production fixes. - Use Case: While rebasing a feature branch onto main, a conflict appears in usePrice.ts. Instead of running git checkout --theirs, you trace both sides, discover main's hunk is a NaN crash fix and the feature side only changed formatting, then union both changes and verify with typecheck and tests. ## Quick Start Resolve the merge conflict in my React/TypeScript repo by reading both sides' intent first, then run typecheck and tests to confirm the resolution.
