multi-agent-git-collaboration-pattern

What problem does it solve?

This Skill prevents multi-agent Git collaboration from failing or corrupting results when concurrent edits and push races occur.

Core Features & Use Cases

• Edit race recovery (modified since read): Detects conflicting changes via grep, re-reads the latest file state, then re-applies the edit to avoid overwriting other agents’ work.
• Push race recovery (non-fast-forward): Automatically handles rejected pushes by using git pull --rebase and a controlled retry approach while avoiding force pushes.
• Safety guardrails for atomicity: Enforces an atomic commit hook so that skill additions and registry entries enter together, plus explicit “never force push” rules.
• Anchor separation strategy: Minimizes “edit location” conflicts by recommending category-based anchor placement for concurrent skills.

Quick Start

Ask the AI to apply the multi-agent Git collaboration process by running install.sh multi-agent-git-collaboration-pattern and then using its race-handling rules during parallel agent edits and pushes.