CLI

TreeResolve ships a standalone command-line tool for a Git mergetool and for headless auto-resolution in CI. npx treeresolve does not add a package dependency to the repo.

# Configure the Git mergetool
npx treeresolve setup-git

# Batch auto-resolve clean syntax conflicts
npx treeresolve auto

# Open the 3-way mergetool
git mergetool -t treeresolve

The VS Code extension is the interactive 3-way canvas. The CLI is the mergetool and the CI path. Both use the same license. A headless run stays on Community unless a Pro or Enterprise license is configured.

The package is treeresolve on npm.