NathanDrake2406

NathanDrake2406 / grove

Public

Cross-worktree conflict intelligence for git. Detects file, hunk, symbol, dependency, and schema overlaps between parallel workstreams before merge time.

cli developer-tools git rust worktree
12
2
100% credibility
Found Feb 24, 2026 at 10 stars -- GitGems finds repos before they trend. Get early access to the next one.
Sign Up Free
AI Analysis
Rust
AI Summary

Grove continuously scans multiple git branches to predict and detail merge conflicts across files, code sections, functions, dependencies, and configs before you try merging.

How It Works

1
😩 Dread merge conflicts

You're working on multiple features at once and worry about painful clashes when combining your changes.

2
📦 Grab Grove

Install this handy helper with a quick command from your favorite package tool.

3
🚀 Start watching

Run a simple check and it quietly starts monitoring your project branches in the background.

4
📊 See the big picture

Open a colorful screen showing all your branches and any risky overlaps at a glance.

5
🔍 Zoom in on pairs

Pick two branches to get details on exactly what might clash and how bad.

✅ Merge with confidence

Fix issues early or merge safely, saving hours of frustration every time.

Sign up to see the full architecture

4 more

Sign Up Free

Star Growth

See how this repo grew from 10 to 12 stars Sign Up Free
Repurpose This Repo

Repurpose is a Pro feature

Generate ready-to-use prompts for X threads, LinkedIn posts, blog posts, YouTube scripts, and more -- with full repo context baked in.

Unlock Repurpose
AI-Generated Review

What is grove?

Grove is a Rust tool that watches your git worktrees and detects file, hunk, symbol, dependency, and schema overlaps between parallel branches before merge conflicts hit. Run `grove status` for a dashboard of orthogonality scores (Green safe, Black breaking), or `grove conflicts feat/auth feat/payments` for details on cross-worktree conflicts. It integrates with shells via `gr switch` for quick worktree hopping and Claude Code hooks to warn AI agents mid-edit.

Why is it gaining traction?

Unlike basic git diff tools, grove shifts conflict detection left with multi-layer scoring across languages like TypeScript, Rust, Python, Go, Java, and C#, spotting dependency breaks or schema clashes early. The TUI dashboard and JSON CLI make it agent-friendly, while real-time watching via daemon handles 20 worktrees without lag. Devs searching andy grove github or nvidia grove github find it for proactive merge hygiene in multi-branch chaos.

Who should use this?

Backend teams juggling parallel features on git worktrees, especially with AI agents like Claude editing in isolation. Multi-dev squads on monorepos tired of late-stage hunk conflicts between feat/auth and feat/payments. Anyone using grove street workflows with frequent dependency changes or schema migrations.

Verdict

Promising for cross-worktree conflict intelligence, with 93% test coverage and solid docs, but at 10 stars and 1.0% credibility, it's early—test in a side project before production. Pairs well with grover login for agent-driven dev, but watch for maturity as it evolves.

(198 words)

Sign up to read the full AI review Sign Up Free

Similar repos coming soon.