merge-resolver

Resolve merge conflicts intelligently using git history. Fetches PR context, identifies conflicted files, uses git blame and commit history to infer developer intent. Applies resolution strategies based on change type (bugfix, feature, refactor). Auto-resolves session artifacts and templates. Validates session protocol before push.

$ Installer

git clone https://github.com/rjmurillo/ai-agents /tmp/ai-agents && cp -r /tmp/ai-agents/.claude/skills/merge-resolver ~/.claude/skills/ai-agents

// tip: Run this command in your terminal to install the skill