resolve-merge-conflicts

Resolve Git merge conflicts by extracting only unresolved paths, conflict hunks, and compact diffs instead of loading whole files. This skill summarizes unmerged paths and displays our, your, and their hunks with minimal surrounding content for per-file drill-down.

Yes, you can inspect conflict markers during a Git rebase or cherry-pick. This skill supports end-to-end workflows where merges, rebases, cherry-picks, or stash pops halt on conflicts, exposing concise diffs and classifying conflict types for each unmerged path.

The best way to view conflicting hunks is using compact conflict previews that classify conflict types and generate concise diffs. It parses conflict markers and displays only the relevant hunks, supporting per-file drill-down and index previews without loading entire files.

No external dependencies are required to parse conflict diffs. The skill relies on built-in scripts to extract context from unmerged paths and generate compact diffs directly from files containing conflict markers when git status shows unmerged paths.

Loading whole conflicted files fails during large Git merges because it overwhelms context limits with non-conflicting code. This skill avoids that limitation by extracting only unresolved paths and compact conflict hunks, reducing cognitive burden while maintaining contextual information.