Privacy-focused AI chatbot that generates uncensored text, code, images, and translations without storing conversations or requiring an account.
Clash
Detects merge conflicts between parallel git worktrees before edits are committed
About Clash
Clash is a command-line tool designed to prevent merge conflicts when multiple AI coding agents operate in separate git worktrees. It runs entirely on the local machine and uses git merge-tree to simulate merges in memory, detecting conflicts before edits are finalized. The tool integrates with AI agents through hooks, CLAUDE.md instructions, or structured JSON output, providing real-time conflict detection and visualization. A conflict matrix shows which branches conflict across all active worktrees, and a watch mode monitors changes as they occur. Clash is intended for developers and teams using parallel AI workflows or multiple worktrees, helping to catch conflicts early and avoid wasted work. It supports integration with popular AI agents like Claude Code and can be used in CI/CD pipelines to fail builds when conflicts are detected.
Key features
- Conflict detection before every AI agent edit
- Real-time monitoring with watch mode
- Conflict matrix visualization across worktrees
- Hook integration for pre-commit and agent workflows
- Structured JSON output for AI agent orchestration
- CI/CD pipeline integration for early conflict detection
- Read-only git merge-tree simulation
- Cross-platform compatibility via Homebrew, Cargo, and shell scripts
Use cases
- Prevent merge conflicts in parallel AI coding workflows
- Block commits that would conflict in human teams via pre-commit hooks
- Fail CI/CD pipelines early when branches would conflict on merge
Pros
- Runs 100% locally with no data leaving the machine
- Detects conflicts before edits are committed
- Provides real-time monitoring and conflict matrix visualization
- Integrates with AI agents via hooks or structured JSON output
- Uses git merge-tree for read-only conflict simulation
Cons
- Does not automatically resolve conflicts
- Requires installation and setup for each AI agent
- Limited to local machine usage
Frequently asked questions about Clash
What does Clash do?
Clash is a command-line tool that prevents merge conflicts when multiple AI coding agents work in separate git worktrees. It detects conflicts before edits are finalized using git merge-tree.
Who is Clash designed for?
Clash is intended for developers and teams using parallel AI workflows or multiple git worktrees. It helps catch conflicts early to avoid wasted work.
How does Clash integrate with AI agents?
Clash integrates with AI agents through hooks, CLAUDE.md instructions, or structured JSON output. It also supports popular agents like Claude Code.
Can Clash be used in CI/CD pipelines?
Yes, Clash can be used in CI/CD pipelines to fail builds when conflicts are detected, ensuring early conflict resolution.
Does Clash run locally or in the cloud?
Clash runs entirely on the local machine, simulating merges in memory to detect conflicts without external dependencies.
What features does Clash provide for conflict detection?
Clash offers real-time conflict detection, a conflict matrix showing branch conflicts across worktrees, and a watch mode to monitor changes as they occur.
Clash traffic & engagement
clash.sh · third-party estimates from Similarweb
Traffic trend
Last 4 months · grows by one month every month
- Jun 202680
- Jul 20261.4K+1695%
- Aug 20262.7K+89%
- Sep 20264K+45.6%
Where visitors come from
Share of visits by channel
No measurable traffic from Social, Paid Referrals or Search.
Top countries
Share of visits · estimated visits
Compared with similar tools
Coding & Development · Sep 2026
Traffic figures are third-party estimates, good for scale and trends; they can differ from a company's own numbers. Updated monthly.