Marketplace

orchestrating-merge-conflict-topology

Understand the structure and relationships of merge conflicts to resolve them systematically. Use when: (1) asked to resolve merge conflicts, (2) git merge or rebase halted with conflicts, (3) conflict markers appear in multiple files, (4) same logical change conflicts across several locations, (5) resolving conflicts without understanding what both sides intended.

$ Installer

git clone https://github.com/synapseradio/thinkies /tmp/thinkies && cp -r /tmp/thinkies/plugins/software/skills/orchestrating-merge-conflict-topology ~/.claude/skills/thinkies

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