Jujutsu megamerges for fun and profit
This title could be clearer and more informative.Try out Clickbait Shieldfor free (5 uses left this month).
A practical guide to the 'megamerge' workflow in Jujutsu (jj), where you create an octopus merge commit combining all your active branches as parents. This lets you always work on the combined sum of your changes, reduces merge conflicts, and makes context-switching nearly frictionless. The post covers how to create a megamerge, how to submit changes back into individual branches using commands like absorb, squash, and rebase, and how to keep everything up to date with a custom restack alias that only rebases mutable commits you control. Includes ready-to-use config aliases for stack, stage, and restack commands.
Table of contents
Merge commits aren’t what you think they areSo what the hell is a megamerge?How do I make one?How do I actually submit my changes?How do I keep all this crap up to date?TL;DRFootnotesSort: