TreeResolve v1.0.2 · 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.

Install from Marketplace Try CLI — npx treeresolve

Fleet rollout? Contact Enterprise →

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
7
Sandboxed WASM Grammars Bundled
CI
Gated Unit Suite Before Every Release
Workflow

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.

Interactive Simulator

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
            

            

          

        

      

      

    

  


  
  

    

      Core Capabilities
      
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.

      


      

        
🔒

        
Source code stays local

        
Merge parsing and conflict resolution run on your machine. Source code is not sent.
          Trials and leases send a device fingerprint to the licensing endpoint. Offline license keys do not.

      


      

        
🔍

        
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.

      

    

  


  
  

    

      

        Plans & Licensing
        
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
    • 
            
  • ✓ Native Git Mergetool Companion
    • 
            
  • ✓ Local execution, no source-code egress
    • 
          

          

            
              Install from Marketplace
            
            
              Or try CLI ·
              Open
                VSX
            
          

        


        
        

          Most Popular
          
Pro

          
For professional software engineers who rebase frequently — one person license, any
            repo, a few machines.

          

            $99
            / year (or $10/mo)
          

          
    
            
  • ✓ Everything in Community
    • 
            
  • ✓ Per-person license (any repo, up to 3 machines)
    • 
            
  • ✓ Full AST auto-merge (Go, Rust, Java, C#, JSON/YAML…)
    • 
            
  • ✓ Lockfile resolvers (npm dedicated; Yarn/PNPM partial)
    • 
            
  • ✓ Batch / CLI / CI merge driver
    • 
            
  • ✓ Repo governance (`.treeresolverc`)
    • 
            
  • ✓ Intra-line token-level micro-diffing
    • 
          

          

            
              Get TreeResolve Pro ($99/yr)
            
            
              Or subscribe monthly for $10/mo →
            
          

        


        
        

          
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
    • 
            
  • ✓ Offline license keys for machines with no network
    • 
            
  • ✓ Volume Discounts (50+, 200+, 1,000+ seats)
    • 
            
  • ✓ Paddle invoicing for qualifying fleets (Net-30 when offered)
    • 
          

          

            
              Buy Fleet Seats ($199/seat)
            
            
              Request Custom Quote or Invoice Terms →
            
          

        

      

      

        Our order process is conducted by our online reseller Paddle.com. Paddle.com is the Merchant of Record for all
        our orders. Paddle provides all customer service inquiries and handles returns.
        See Terms, Privacy, and
        Refund Policy (30-day money-back).
      

    

  


  
  

    

      FAQ
      
Answers Before You Start

      
Trial, privacy, 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 TS/JS/Python import auto-merge. 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.
        

      


      

        Which languages get deterministic auto-merge?
        

          The language table lists dedicated AST normalizers, partial lockfile coverage,
          and the line-based fallback for everything else.
        

      


      

        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).