TreeResolve v0.4.0 Live • Zero-AI Deterministic Merge Engine

Deterministic, Syntax-Aware
3-Way Merge Conflicts

Turn tedious manual rebase slogs into effortless operations. TreeResolve replaces line-based guesswork with local concrete syntax tree comprehension—zero hallucinations, zero cloud lock-in, and instant local execution.

TreeResolve 3-Way Canvas Viewport — Ours (Current) | Merged Result | Theirs (Incoming)
TreeResolve 3-Way Conflict Canvas with Bézier Ribbons and Intra-Line Token Micro-Diffing
100%
Deterministic (Zero AI / Zero Hallucinations)
0ms
Network Latency (Local AST Execution)
7
Sandboxed WASM Grammars Bundled
49/49
Automated Unit Verification Tests

See Deterministic Merging in Action

Experience how TreeResolve safely reconciles non-colliding syntax changes that cause standard Git to fail.

Conflicted Buffer (Raw Git Diff3) Conflicts Flagged

          
TreeResolve Synthesized Result Deterministic AST

          

Built for Performance and Precision

Traditional merge tools rely on line-based guessing. TreeResolve brings full compiler-grade understanding directly to your editor.

Concrete Syntax Tree Engine

Pre-compiled WebAssembly parsers parse AST nodes in background workers, performing mathematical set-difference reconciliations with 3-way deletion tracking.

🎨

Dynamic Bézier Ribbons

Hardware-accelerated HTML5 canvas ribbons link corresponding code blocks across Ours, Merged Result, and Theirs with proportional alignment scrolling.

🔒

Air-Gapped & Zero Data Egress

Your source code never leaves your local machine. No LLMs, no remote API calls, no token leakage. Complies with the strictest InfoSec policies.

🔍

Intra-Line Token Micro-Diffing

Off-thread LCS diffing visually distinguishes exact character and word substitutions within conflicting lines, highlighting additions and deletions in color.

📦

Semantic Lockfile Resolution

Automatically auto-merges non-breaking semver bumps and concurrent package additions in package-lock.json while aligning SHA-512 integrity hashes.

⚙️

Repo Policy Engine (.treeresolverc)

Check project-level glob policies directly into your Git repository to govern auto-merge rules and automatic staging across large engineering teams.

Standalone Git Mergetool Companion

Prefer working in the terminal or running headless auto-resolution in CI/CD pipelines? TreeResolve includes a standalone CLI executable with zero dependencies.

# 1. Configure Git global mergetool in one command
npx treeresolve setup-git

# 2. Batch auto-resolve all clean syntax conflicts
npx treeresolve auto

# 3. Direct 3-way invocation in Git mergetool
git mergetool -t treeresolve

Simple, Predictable Pricing

Enjoy a 14-day unrestricted Reverse Trial on install. No credit card required. Upgrade anytime for permanent AST auto-merge superpowers.

Community

For open-source contributors and individual developers needing a rock-solid 3-pane merge canvas.

$0 / forever
  • 3-Pane Visual Merge Canvas
  • Dynamic Bézier Ribbon Diffing
  • Synchronized Viewport Scrolling
  • Native Git Mergetool Companion
  • 100% Local Execution & Zero Source Code Egress
  • Anonymous Merge Metrics (Opt-Out Control)

Enterprise

For engineering organizations, compliance-driven teams, and multi-developer fleet rollouts.

$199 / seat / year (or $20/mo)
  • Everything in Pro
  • Multi-Repo Wildcard Domain Leases
  • Centralized MDM, Intune & Jamf Distribution
  • Air-Gapped & SCIF Network Compliance
  • Volume Discounts (50+, 200+, 1,000+ seats)
  • Invoicing, Net 30, ACH & PO Support

Procurement, MDM & Custom Inquiries

Deploy TreeResolve securely across hundreds of engineering seats. We support centralized MDM rollout, air-gapped cryptographic licensing, and dedicated SLA contracts.

  • Air-Gapped Cryptographic Leases: Ed25519-signed offline licenses verified without external network calls.
  • Fleet Rollout: Silent automated distribution via Microsoft Intune, Jamf Pro, and Ansible.
  • Commercial Invoicing: Net 30 / Net 60 payment terms, ACH, wire transfers, and corporate POs.
  • Zero Data Egress: Fully verified local execution with zero source code or credential transmission.

Community & Discussions:

TreeResolve Community Portal →