Resolving Merge Conflicts

Resolve an in-progress git merge or rebase conflict by understanding the intent behind each side (commit messages, PRs, issues) before touching a hunk, preserving both intents where possible, then running the project's checks and finishing the operation. Use when you hit a git merge/rebase conflict, or the user asks to resolve one.

ever-just Updated 6 repo stars

File contents

ever-just/agentskills commit f062c31925

Frequently asked questions

npx get-skill add ever-just/resolving-merge-conflicts