← All extensions

JJ Conflict Resolver

v0.1.0 · by Nils Koch · added 3 November 2026

LSP to resolve conflicts in the jj-vcs

Language servers

How to install

With Forge Super installed, the button above opens the app on this extension, where you press Install. Nothing is installed until you do.

You can also open the Extensions panel in the app and search for JJ Conflict Resolver. The extension's id is jj-lsp.

Don't have Forge Super yet? Download it here.

README

From the extension's repository, written by its authors and not by Mentenaz. See the source.

zed-jj-lsp

This is the Zed extension for the jj-lsp.

How it works

jj-lsp is installed in PATH

The extension will automatically detect if jj-lsp is installed in your PATH and use it for the LSP if it is available.

jj-lsp is not installed in PATH

The extension will fetch the latest release of the jj-lsp and cache it locally in the Zed extension directory. It will clean up old versions of the lsp when a new version is downloaded.

License

This project is licensed under the MIT License.