Built a tool that detects merge conflicts across worktrees before merge time. I (actually, Claude) did this because it was overwhelming trying to run multiple agents, and especially painful and wasting tokens when they conflict at merge time. It's also rough trying to maintain orthogonality if your codebase isn't squeaky clean and modular.

Grove is a daemon written in Rust, it watches your worktrees, continuously analyzes diffs against a shared base, and scores how likely each pair is to collide. Supported languages: TS, Rust, Python, Java, C# and Go.

You can use a post Edit/Write hook to run this automatically. It also has a TUI with lazygit-like style dashboard :)

It's probably still pretty rough rn, but pls let me know what u think!