Resolving Merge Conflicts

Trace both sides of an in-progress Git merge or rebase conflict, resolve compatible intent with scoped authority, and gate incompatible intent. Use only when the user explicitly asks to inspect or resolve current conflicts.

carlitose Updated 0 repo stars

File contents

carlitose/agent-skills commit 00ec84cbc0

Frequently asked questions

npx get-skill add carlitose/resolving-merge-conflicts