What should I do if my git state becomes corrupted by parallel agents?

The skill provides a 6-step recovery protocol: stop all agents, assess damage via git logs, stash work, fix branch relationships, redistribute files to correct branches, and verify the structure.

Why can't subagents perform git commits directly?

When multiple agents commit simultaneously from the same initial state, they create conflicting branch histories (siblings instead of stacks), leading to repository corruption and manual recovery effort.

Does this skill work with Graphite or GitButler?

Yes, it includes specific command patterns and logic for managing Graphite stacked PRs and GitButler virtual branches within a multi-agent context.

How does the orchestrator track subagent changes?

Subagents are instructed to write to the filesystem and report exactly which files were modified, allowing the orchestrator to stage and commit those specific changes to the correct branches.

Multi-Agent Git Coordinator

Name: Multi-Agent Git Coordinator
Author: outfitter-dev

byoutfitter-dev

•

開発者ツール

Coordinates parallel git operations across multiple AI agents to prevent repository corruption and branch conflicts.

概要

This skill establishes a strict orchestrator-only policy for version control when dispatching parallel subagents. By restricting subagents to filesystem-only modifications and centralizing git operations in the primary agent, it eliminates common issues like mixed content, broken branch stacks, and mislabeled pull requests. It provides specific implementation patterns for standard Git, Graphite stacked PRs, and GitButler virtual branches, ensuring a stable and recoverable development environment during complex, multi-agent AI workflows.

主な機能

Prevention of parallel branch corruption and stack errors
Standardized subagent prompt templates for git safety
18 GitHub stars
Orchestrator-only git operation policy
Multi-tool support for Graphite and GitButler workflows
Defined recovery protocols for corrupted git states

ユースケース

Coordinating multi-branch implementations with GitButler
Managing complex stacked pull requests using Graphite
Dispatching parallel subagents for multi-feature development

概要

主な機能

Prevention of parallel branch corruption and stack errors
Standardized subagent prompt templates for git safety
18 GitHub stars
Orchestrator-only git operation policy
Multi-tool support for Graphite and GitButler workflows
Defined recovery protocols for corrupted git states

ユースケース

Coordinating multi-branch implementations with GitButler
Managing complex stacked pull requests using Graphite
Dispatching parallel subagents for multi-feature development