{"repo":"clash-sh/clash","free":true,"listed":false,"github":"https://github.com/clash-sh/clash","clone":"git clone https://github.com/clash-sh/clash.git","description":"Avoid merge conflicts across git worktrees for parallel AI coding agents","language":"Rust","stars":63,"topics":["ai-agents","claude-code","cli","developer-tools","git","merge-conflicts","multi-agent","rust","worktree","agentic-coding"],"license":"MIT","category":"ai-agents","readme_excerpt":"Clash Avoid merge conflicts across git worktrees for parallel AI coding agents Clash is an open-source CLI tool that helps avoid merge conflicts across git worktrees . It's designed for developers running multiple AI coding agents ( Claude Code, Codex, Cursor , etc.) in parallel — helping them identify potential conflicts early in the development process so they can work around them before it's too late. Table of Contents - Problem Statement - Clash - The Saviour - Quick Start - Step 1: Quick Setup (Claude Code Recommended) - Step 2: Other Setups - Step 3: Manual CLI Usage - Core Features - Plugin Integration - Check Command - Status Command - Watch Mode - JSON Output - Example: Multi-Agent Workflow - How It Works - Use Cases - Architecture - Contributing - FAQ Problem Statement with Some Context AI coding agents like Claude Code have transformed software development as we know it. Developers now run 3-6+ agents simultaneously , each working on a different feature/bug fix. The recommended approach put forward by most frontier labs is to isolate each agent in its own git worktree — essentially a separate working directory with its own branch. When multiple AI agents (or developers) work in separate worktrees, they're blind to each other's changes and inevitably touch overlapping parts of the codebase. Conflicts only surface at feature completion, often after significant work and time is wasted . Current tools only catch these conflicts later down the line — we can do better by","default_branch":null,"files":null,"tree":[],"storefront":"/r/clash-sh","claimed":false,"request_supported":{"post":"https://gitbuyer.com/r/clash-sh/clash/request-supported","requests":0},"note":"indexed from public GitHub; nothing is for sale on this page. Clone it from GitHub. Paid listings live at /search."}