A Language Server Protocol (LSP) implementation for resolving conflicts in the jj-vcs.

When you hit a merge conflict, jj-lsp highlights the problem and helps you fix it with quick actions.

This video shows all available features:

You can install the jj-lsp via a Zed extension called JJ Conflict Resolver. There is no further configuration needed :)

cargo install --git https://github.com/nilskch/jj-lsp.git

This project is licensed under the MIT License.