Clash – Detect Git worktree conflicts before parallel agent edits
Early conflict detection via merge simulation—directly fixes Claude Code's worktree blindness problem.

git merge-tree simulation predicts conflicts in-editor before you open a PR.
Developers working on collaborative Git repositories with frequent merges
GitLens · Merge Conflicts · GitHub Pull Requests
Early conflict detection via merge simulation—directly fixes Claude Code's worktree blindness problem.
Watch PRs pile up in GitFlow then switch to trunk-based and see the difference.
Terminal-native 3-way merge TUI when meld and vimdiff already dominate.
Neovim-powered diff viewer that works standalone, no plugin manager or config required.
Finally a mergetool that doesn't force you out of the terminal workflow.
Prevents merge conflicts before code is written, unlike git which detects them after.