A conflict resolution merge tool for Jujutsu VCS that runs in Neovim
☆140May 19, 2026Updated 4 months ago
Alternatives and similar repositories for jj-diffconflicts
Users that are interested in jj-diffconflicts are comparing it to the libraries listed below. We may earn a commission when you buy through links labeled 'Ad' on this page.
Sorting:
- A tool for splitting diffs in Neovim☆382Updated this week
- A Neovim frontend for Jujutsu with blazing fast UX☆56Sep 3, 2026Updated last month
- 🥋 Drive Jujutsu (jj) VCS from Neovim like a pro☆274Updated this week
- Plugin which adds syntax highlighting to .jjdescription files in Vim -- (mirror of the original repo at Gerrit: https://gerrit.avm99963.c…☆26May 8, 2025Updated last year
- ☆29Aug 8, 2026Updated 2 months ago
- Deploy to Railway using AI coding agents - Free Credits Offer • AdUse Claude Code, Codex, OpenCode, and more. Autonomous software development now has the infrastructure to match with Railway.
- An interactive and powerful Jujutsu interface for Neovim, inspired by Magit, forked from Neogit☆75Sep 16, 2026Updated 3 weeks ago
- TUI for Jujutsu/jj☆1,225Sep 24, 2026Updated 3 weeks ago
- jjui is a TUI designed for interacting with the Jujutsu version control system.☆2,200Oct 3, 2026Updated last week
- Auto load optional plugins via lua modules with lz.n☆14Sep 15, 2026Updated last month
- Text UI for Jujutsu based on fzf, centering around the jj log with key bindings for common operations☆256Updated this week
- Neovim frontend for Jujutsu in the style of vim-fugitive☆83Aug 27, 2026Updated last month
- A neovim plugin to run lazyjj in a window.☆43Oct 3, 2026Updated last week
- gerrit style tui patchset diff viewer for github / bitbucket using jj☆39Sep 7, 2026Updated last month
- The power tool for Jujutsu + GitHub workflows. Adapted from spr by @LucioFranco.☆181Jul 31, 2026Updated 2 months ago
- Wordpress hosting with auto-scaling - Free Trial Offer • AdFully Managed hosting for WordPress and WooCommerce businesses that need reliable, auto-scalable performance. Cloudways SafeUpdates now available.
- A Neovim plugin that displays difftastic's structural diffs in a side-by-side view with syntax highlighting.☆115Jul 9, 2026Updated 3 months ago
- GitHub Stacked PR with JJ☆20Sep 12, 2023Updated 3 years ago
- Archived, use https://github.com/LucioFranco/jj-spr instead☆62Nov 15, 2025Updated 11 months ago
- Small plugin to pull up jj/jujutsu using the jjtui Go project.☆21Apr 20, 2026Updated 5 months ago
- Lightning-fast JJ UI☆166Sep 29, 2026Updated 2 weeks ago
- Run pre-commit.com before `jj git push`☆79Sep 19, 2026Updated 3 weeks ago
- jj-navi is workspace orchestrator for Jujutsu (jj), built for parallel human and AI agentic workflows☆37May 12, 2026Updated 5 months ago
- Edit diffs in a 3-pane view☆109Feb 5, 2026Updated 8 months ago
- GG - Gui for JJ☆865Sep 23, 2026Updated 3 weeks ago
- Managed hosting for WordPress and PHP on Cloudways • AdManaged hosting for WordPress, Magento, Laravel, or PHP apps, on multiple cloud providers. Deploy in minutes on Cloudways by DigitalOcean.
- A TUI to manipulate the Jujutsu DAG.☆112Sep 2, 2026Updated last month
- A TUI for the Jujutsu version control system☆159Jul 27, 2026Updated 2 months ago
- Stacked PRs for Jujutsu. Push bookmark stacks to GitHub and GitLab as chained pull requests.☆195Sep 5, 2026Updated last month
- Neovim Lua plugin to generate Neovim help files. Part of 'mini.nvim' library.☆29Aug 4, 2026Updated 2 months ago
- A modal interface for Jujutsu☆86Nov 19, 2025Updated 10 months ago
- Jujutsu support for Z Shell☆22Oct 5, 2026Updated last week
- [maintainer=@mrcjkb, @xBLACKICEx]☆33Updated this week
- No worry about nested Nvim in Nvim terminal☆103Aug 29, 2026Updated last month
- Run busted tests with Neovim☆32Oct 8, 2026Updated last week
- Wordpress hosting with auto-scaling - Free Trial Offer • AdFully Managed hosting for WordPress and WooCommerce businesses that need reliable, auto-scalable performance. Cloudways SafeUpdates now available.
- Stacked PRs on GitHub for Jujutsu☆102Oct 24, 2025Updated 11 months ago
- 🦥 A dead simple lazy-loading Lua library for Neovim plugins.☆298Updated this week
- track claude code sessions as jj-vcs changes☆26Jan 30, 2026Updated 8 months ago
- A TreeSitter-powered formatter orchestrator☆74Mar 19, 2026Updated 6 months ago
- LSP to resolve conflicts in the jj-vcs☆80Mar 1, 2026Updated 7 months ago
- Neovim plugin for interacting with Rust-Analyzer's LSP extensions☆124Aug 4, 2025Updated last year
- local merge queue for jj☆25Sep 2, 2026Updated last month