A Better Merge Workflow with Jujutsu

This page summarizes the projects mentioned and recommended in the original post on news.ycombinator.com

SaaSHub - Software Alternatives and Reviews
SaaSHub helps you find the best software and product alternatives
www.saashub.com
featured
  • jj

    A Git-compatible VCS that is both simple and powerful

    Jujutsu seems really cool, and I love that I can use it in a Git repository alongside other contributors that don't. It seems like a lot of logging features from Git aren't present, though.

    Besides the mentioned lack of blame functionality[1], things like path filtering (`git log -- `), file-following with rename detection (`git log --follow -- `), pickaxe (`git log -S `), and range evolution (`git log -L,:`). These tools have all become pretty indispensable to me in my day-to-day work since I've learned them, and I know I can still use them since jj can use Git as a backend, but I don't think I could adopt a tool that doesn't have them as first-class features.

    Do any regular users of Jujutsu have thoughts on this?

    [1] https://github.com/martinvonz/jj?tab=readme-ov-file#status

  • SaaSHub

    SaaSHub - Software Alternatives and Reviews. SaaSHub helps you find the best software and product alternatives

    SaaSHub logo
  • gitbutler

    The GitButler version control client, backed by Git, powered by Tauri/Rust/Svelte

    As an example of convergent evolution, this workflow is very similar to virtual branches from https://gitbutler.com/.

  • gg

    GG - Gui for JJ (by gulbanana)

    Most are using it from the command line, but https://github.com/gulbanana/gg is an in-progress GUI.

    I don't use collocated repositories, so I can't speak to your second question, but I rarely hear people complain about it on their Discord.

  • lazyjj

    TUI for Jujutsu/jj

  • Visual Studio Code

    Visual Studio Code

    Theoretically that would be nice, but there are always edge cases. VSCode still does not let you have a personal configuration file for a project[0] (open since 2016). There are workarounds, but many of them are less good than just manually ignoring the modified file.

    [0] https://github.com/microsoft/vscode/issues/15909

  • git-delete-merged-branches

    :fire: Command-line tool to delete merged Git branches

    A tool such as git-delete-merged-branches[1] may also be helpful.

    [1]: https://github.com/hartwork/git-delete-merged-branches

NOTE: The number of mentions on this list indicates mentions on common posts plus user suggested alternatives. Hence, a higher number means a more popular project.

Suggest a related project

Related posts

  • TexStudio - git integration for easy committing?

    5 projects | /r/LaTeX | 20 Feb 2023
  • Ask HN: Git Alternatives – Sapling vs. Jj

    3 projects | news.ycombinator.com | 7 Dec 2024
  • Build a Command-Line Application With Deno 2.0

    3 projects | dev.to | 11 Nov 2024
  • Jujutsu (jj), a Git compatible VCS

    1 project | news.ycombinator.com | 20 Oct 2024
  • How to fork: Best practices and guide

    1 project | news.ycombinator.com | 15 Oct 2024

Did you konow that Rust is
the 5th most popular programming language
based on number of metions?