merge-conflict-resolver

To resolve git merge conflicts, this Skill analyzes conflict markers to understand "ours" vs. "theirs" differences, then recommends keeping local changes, accepting remote changes, combining them, or rewriting sections before staging files for commit.

Understanding conflicting code changes during a git merge involves interactively analyzing conflict markers to distinguish your current branch changes from incoming changes, which clarifies whether to keep ours, keep theirs, or combine both sections.

Yes, you can get recommendations on whether to keep local or remote changes for each conflict hunk; the Skill suggests the best resolution strategy with clear reasoning, offering options to keep ours, keep theirs, combine, or rewrite.

To apply conflict resolutions and stage files for commit after a failed git rebase, the Skill guides you through applying your chosen resolution to the conflicting sections and staging the cleaned files to finalize the repository state.

No specific version control dependencies are required to analyze conflict markers; the Skill operates independently with its scripts and references to process git merge, rebase, and cherry-pick conflicts directly in your environment.

Using an interactive conflict resolver instead of manually editing git conflict markers prevents data loss and project stalls by providing intelligent recommendations and guided staging, ensuring complex differences are accurately combined or rewritten.