Manage merge conflicts across git worktrees for parallel AI coding agents

Main Repository • Website • Installation • Quick Start

Clash is a CLI tool that detects merge conflicts between all worktree pairs during development, helping developers and AI agents work in parallel without conflicts.

# macOS/Linux
curl -fsSL https://clash.sh/install.sh | sh

# Homebrew
brew install clash-sh/tap/clash

# Cargo
cargo install clash-sh

When running multiple AI coding agents (Claude Code, Cursor, etc.) in parallel worktrees, conflicts only surface at merge time. Clash detects them in real-time so you can adapt early.

# Check conflicts across all worktrees
clash status

# Monitor in real-time
clash watch

# JSON output for automation
clash status --json

Check out the full documentation to get started!