A merge workflow for activating multiple branches simultaneously using Jujutsu, an alternative VCS to Git.
jennings/jj-spr
The power tool for Jujutsu + GitHub workflows. Adapted from spr by @LucioFranco.
Jujutsu For Busy Devs | maddie, wtf?!
Jujutsu (jj) is a version control system with a significantly simplified mental model and command-line interface compared to Git, without sacrificing expressibility or power (in fact, you could argue Jujutsu is more powerful). Stacked-diff workflows, seamless rebases, and ephemeral revisions are all natural with jj, and it uses Git as a backend, which means you can begin using it non-destructively with a single command and can always drop back down to Git if you need to.
Introduction - Jujutsu for everyone
A Jujutsu tutorial that requires no previous experience with Git or other version control systems.
Solving Git's Pain Points with Jujutsu (with Martin von Zweigbergk)
Jujutsu megamerges for fun and profit
A practical guide to creating and maintaining powerful megamerge workflows in Jujutsu for faster, conflict-free development.
From Zero to GitHub: Starting A New jj (Jujutsu) Repo
I document the steps and missteps that I take setting up a new jujutsu repo and pushing it to GitHub
weave — Merge without conflicts
Entity-level semantic merge driver for Git. Two agents edit different functions in the same file? Clean merge. Every time.
Resolve simple merge conflicts on GitHub
You can now resolve simple merge conflicts on GitHub right from your pull requests, saving you a trip to the command line and helping your team merge pull requests faster.…
Sublime Merge - Git client from the makers of Sublime Text
Blaze through your commits with Sublime Merge - available on Mac, Windows and Linux
Introduction - Steve's Jujutsu Tutorial
Hi there, I'm Steve. This is a tutorial for Jujutsu—a version control system.
Introduction - Steve's Jujutsu Tutorial
Hi there, I'm Steve. This is a tutorial for Jujutsu—a version control system.
mergiraf
A syntax-aware git merge driver for a growing collection of programming languages and file formats.
jusi-aalto/strategic-revision
Contribute to jusi-aalto/strategic-revision development by creating an account on GitHub.
Evan's Jujutsu Tutorial
Jujutsu (from here on, "jj") is a version control system that is both simple and powerful. This site is a tutorial will help you learn to use jj.