Get the latest tech news

A better merge workflow with Jujutsu


A merge workflow for activating multiple branches simultaneously using Jujutsu, an alternative VCS to Git.

Since reading Chris Krycho’s essay introduction to Jujutsu, I’ve been excited about the possibilities of a more modern, user-friendly Version Control System (VCS) tool. I’ve shown how you can use Jujutsu to manipulate merge commits and work on separate logical branches of code, by adding and removing parents using the jj rebase command. In fact, GitButler —a new Git client—was recently launched with a similar end product: making it easy to activate different “virtual branches” in your working directory.

Get the Android app

Or read this on Hacker News

Read more on:

Photo of merge workflow

merge workflow

Photo of jujutsu

jujutsu