Skip to content
<awesome-gh-repos>
vic

nilskch/jj-lsp

LSP to resolve conflicts in the jj-vcs
Source code at GitHub null
nilskch/jj-lsp.json
{
  "createdAt": "2025-03-27T21:43:14Z",
  "defaultBranch": "main",
  "description": "LSP to resolve conflicts in the jj-vcs",
  "fullName": "nilskch/jj-lsp",
  "homepage": null,
  "language": "Rust",
  "name": "jj-lsp",
  "pushedAt": "2025-11-13T20:30:22Z",
  "stargazersCount": 65,
  "topics": [],
  "updatedAt": "2025-11-21T05:08:44Z",
  "url": "https://github.com/nilskch/jj-lsp"
}

[License: MIT]!(LICENSE)

jj-lsp

Section titled “jj-lsp”

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.

Demo

Section titled “Demo”

This video shows all available features:

https://github.com/user-attachments/assets/15ec57b6-810f-4e62-b9ad-097a2564f78a

Installation

Section titled “Installation”

Zed Extension

Section titled “Zed Extension”

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

Cargo

Section titled “Cargo”
cargo install --git https://github.com/nilskch/jj-lsp.git

License

Section titled “License”

This project is licensed under the [MIT License]!(LICENSE).