Merge Resolver

Resolve merge conflicts by analyzing git history and commit intent. Handles PR conflicts, branch conflicts, and session file conflicts with automated resolution for known patterns. Use when you say "resolve merge conflicts", "fix conflicts on this branch", "PR has conflicts with main", "can't merge due to conflicts", or "resolve PR conflicts". Do NOT use for rebasing, cherry-picking, or complex history rewrites (use git-advanced-workflows).

rjmurillo Updated 49 repo stars

File contents

rjmurillo/ai-agents commit 6650927939

Frequently asked questions

npx get-skill add rjmurillo/merge-resolver-2