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.
Fleet rollout or invoiced quote? Contact Enterprise →
Install once. Lead with lockfile conflicts—especially
package-lock.json—auto-resolve what is safely disjoint, then review before you save.
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.
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.
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.
Experience how TreeResolve safely reconciles non-colliding syntax changes that cause standard Git to fail.
Traditional merge tools rely on line-based guessing. TreeResolve brings full compiler-grade understanding directly to your editor.
Pre-compiled WebAssembly parsers parse AST nodes in background workers, performing mathematical set-difference reconciliations with 3-way deletion tracking.
Hardware-accelerated HTML5 canvas ribbons link corresponding code blocks across Ours, Merged Result, and Theirs with proportional alignment scrolling.
Your source code never leaves your local machine. No LLMs, no remote API calls, no token leakage. Complies with the strictest InfoSec policies.
Off-thread LCS diffing visually distinguishes exact character and word substitutions within conflicting lines, highlighting additions and deletions in color.
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.
Check project-level glob policies directly into your Git repository to govern auto-merge rules and automatic staging across large engineering teams.
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 |
TreeResolve sits between classic Git merge UIs and AI merge assistants—with deterministic local AST math and zero source egress.
Enjoy a 14-day unrestricted Reverse Trial on install. No credit card required. Upgrade anytime for permanent AST auto-merge superpowers.
For open-source contributors and individual developers needing a rock-solid 3-pane merge canvas.
For professional software engineers who rebase frequently — one person license, any repo, a few machines.
For engineering organizations, compliance-driven teams, and multi-developer fleet rollouts.
Trial, privacy, language support, and how TreeResolve differs from AI merge tools.
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.
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.
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).
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.
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.
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.
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).
Deploy TreeResolve across engineering seats with MDM-friendly rollout docs, air-gapped cryptographic licensing, and support targets a solo vendor can meet.
Community & Discussions:
TreeResolve Community Portal →