Resolve Merge Conflicts From Parallel Agents

Use when two agents changed the same file or branch and git reports conflicts. Resolves by re-deriving each child's intent from its brief rather than picking a side blindly.

jiayaoqijia Updated 81 repo stars

File contents

jiayaoqijia/cryptoskill commit 86e81a574b

Frequently asked questions

npx get-skill add jiayaoqijia/resolve-merge-conflicts-from-parallel-agents