TreeResolve v1.0.0 · Live on VS Code Marketplace

Lockfile Conflicts First.
Review Every Auto-Resolution.

TreeResolve auto-merges safe package-lock.json hunks (yarn/pnpm coverage stays partial), then makes every auto-resolution easy to review before you save—deterministic, local-first, zero AI, no source-code egress.

VS Code Marketplace still-systems.ss-treeresolve Open VSX stillsystems.treeresolve npm treeresolve TreeResolve on GitHub 14-day reverse trial · No credit card · Zero source egress
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
CI
Gated Unit Suite Before Every Release

From Conflict to Commit in Three Steps

Install once. Lead with lockfile conflicts—especially package-lock.json—auto-resolve what is safely disjoint, then review before you save.

1

Install

Install from the VS Code Marketplace (still-systems.ss-treeresolve), Open VSX for VSCodium (stillsystems.treeresolve), or run npx treeresolve. Enjoy a 14-day reverse trial with full Pro features—no credit card.

2

Auto-resolve lockfiles

When a merge or rebase hits a conflict, open the file and run TreeResolve: Open 3-Way Merge Editor (or Reopen Editor With…), or Batch Auto-Resolve Lockfiles & Deterministic Conflicts for clean cases. Deepest coverage is package-lock.json; yarn/pnpm stay partial.

3

Review & save

Run Review Auto-Resolved Conflicts or scan Tier-1 cards in the canvas (policy labels like Lockfile). True collisions stay visible. Save with normal undo—then continue your rebase.

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.

📦

Lockfile-First Resolution

Dedicated 3-way semver / integrity alignment for package-lock.json. yarn.lock and pnpm-lock.yaml stay partial (key-union / YAML helpers). Every auto-resolution is reviewable before save.

⚙️

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.

Compiler-Grade Where It Matters

Dedicated AST normalizers for popular stacks. Every other text file still opens in the 3-way visual canvas.

Language Deterministic auto-merge 3-way visual diff
TypeScript / JavaScript AST imports & structural declarations Yes
Python AST imports & functions Yes
JSON / JSONC Deep non-colliding keys Yes
npm Lockfile (package-lock.json) Dedicated 3-way semver / integrity alignment Yes
yarn.lock / pnpm-lock.yaml Partial key-union / YAML 3-way (denser cases stay manual) Yes
Go Imports, structs & fields Yes
Rust Use trees, structs & enum variants Yes
YAML Indentation-safe key union Yes
Java Package & static imports Yes
C# Using / static / global directives Yes
All other languages Line-based fallback Yes

Not Line Guesswork. Not an LLM.

TreeResolve sits between classic Git merge UIs and AI merge assistants—with deterministic local AST math and zero source egress.

vs Line-based Git

  • Git conflicts on disjoint edits that never touch the same syntax nodes
  • TreeResolve parses the AST and auto-merges safe set-differences
  • True overlapping edits still surface for human review

vs AI merge tools

  • Zero AI — same inputs always produce the same result
  • No hallucinations, prompts, or model drift
  • Source never leaves your machine; works air-gapped

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
  • ✓ TS/JS/Python import auto-merge taste
  • ✓ Native Git Mergetool Companion
  • ✓ 100% Local Execution & Zero Source Code Egress

Enterprise

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

$199 / seat / year (or $20/mo)
  • ✓ Everything in Pro
  • ✓ Seat-based fleet licensing + org wildcards
  • ✓ Centralized MDM, Intune & Jamf Distribution
  • ✓ Air-Gapped & SCIF Network Compliance
  • ✓ Volume Discounts (50+, 200+, 1,000+ seats)
  • ✓ Invoicing / PO by quote for qualifying fleets

Answers Before You Start

Trial, privacy, language support, and how TreeResolve differs from AI merge tools.

What happens after the 14-day reverse trial?

TreeResolve automatically degrades to the free Community tier. Your editor is never locked — you keep the 3-pane merge canvas and can resolve conflicts manually. Upgrade to Pro anytime for unlimited deterministic AST auto-merge. No credit card is required to start the trial.

Does my source code leave my machine?

No. Parsing, AST analysis, and conflict resolution run locally. TreeResolve does not send source code, conflict hunks, or repository contents to LLMs or cloud merge services. See the Privacy Policy.

What is the anonymous device fingerprint used for?

To issue reverse trials and renew floating leases without accounts or passwords, TreeResolve may send an anonymized SHA-256 hash of platform:arch:machineId (truncated to 32 hex characters). No usernames, hostnames, or MAC addresses are included. Offline / air-gapped enterprise keys never contact the licensing endpoint for validation. Licensing traffic currently uses https://treeresolve-licensing.still-systems.workers.dev; https://licensing.stillsystems.com is the planned custom-domain cutover (not live yet).

Which languages get deterministic auto-merge?

Dedicated AST normalizers cover TypeScript/JavaScript, Python, Go, Rust, Java, C#, JSON/JSONC, and YAML. Lockfile auto-merge is deepest for package-lock.json; yarn.lock and pnpm-lock.yaml are partial (see known limitations #6). All other languages still open in the 3-way visual canvas with a graceful line-based fallback.

How is this different from AI merge tools?

TreeResolve is zero-AI and deterministic: the same inputs always produce the same merge result. There are no hallucinations, no prompt leakage, and no dependency on a remote model. If two changes are syntactically disjoint, they merge; true conflicts stay visible for you to decide.

Do I need the VS Code extension, the CLI, or both?

The extension gives you the interactive 3-way canvas inside VS Code. The standalone CLI (npx treeresolve) works as a Git mergetool and for headless / CI auto-resolution. Both share the same licensing model. Headless runs default to Community unless a Pro or Enterprise license is configured.

Where can I install if I use VSCodium or Open VSX?

VS Code users: install still-systems.ss-treeresolve from the Marketplace. VSCodium users: install stillsystems.treeresolve from Open VSX (or use the CLI via npx treeresolve).

Procurement, MDM & Custom Inquiries

Deploy TreeResolve across engineering seats with MDM-friendly rollout docs, air-gapped cryptographic licensing, and support targets a solo vendor can meet.

  • ✓ 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: Self-serve card via Paddle; invoiced / PO (Net-30 case-by-case) for qualifying fleets. Extended Net-60 is not standard.
  • ✓ Zero Data Egress: Fully verified local execution with zero source code or credential transmission.

Community & Discussions:

TreeResolve Community Portal →