Jujutsu megamerges for fun and profit

https://isaaccorbrey.com/notes/jujutsu-megamerges-for-fun-and-profit

52•icorbrey•1h ago

Comments

incognito124•1h ago

Finally

icorbrey•1h ago

Look man life gets busy and I'm horrible at accepting "good enough" lol

schpet•48m ago

love to see it, been looking forward to this.

dbt00•1h ago

this is great stuff. I've been ad hoc building a version of this workflow, and it is quite fantastic.

I'm still not as smooth at figuring out conflicts on mega-rebase.

grim_io•58m ago

If this works like I think it does, it might be the missing piece I've been waiting for, for actually trying jj. Thanks!

icorbrey•55m ago

Awesome! Tbh other than GitButler idk where I'd even start if I had to recreate this with vanilla Git

VerTiGo_Etrex•54m ago

Makes me happy to see the influx of jj posts as of late. Great tool. Roughly this workflow is how I convinced a few friends to finally loosen their death grip on git and try something new.

taberiand•49m ago

How does the megamerge handle the case where two included branches overlap in changes and a new commit is made that applies to the overlap?

nvahalik•47m ago

The mega merge wouldn't handle that based on the way the article shows. You COULD have a revset that includes stacked changes, though. That does work and is what I currently do.

icorbrey•40m ago

This is something you have to generally handle manually since absorb won't squash hunks with ambiguous targets, but I typically stack these branches and accept the dependency. I have had instances where this has backfired a little bit re: ordering but thankfully with JJ and the very patient little man in my computer named Codex it's easy to reorder them and end up with the same diff

nvahalik•48m ago

Great article, Isaac!

If anyone is JJ-curious, I also can't recommend the Discord[1] enough. The community is very helpful and welcoming.

[1]: https://discord.com/invite/dkmfj3aGQN

nchmy•19m ago

Some fantastic tricks in this article. Will definitely improve my Megamerge game. Thanks!

Though, I'd be remiss not to mention that this (and any other) jj workflow would be much easier with jjui. It's the best TUI around, not just for jj

I proposed incorporating some of this article into it. https://github.com/idursun/jjui/discussions/644

juped•11m ago

It's interesting to see the strange workflows that come from jujutsu users, as someone who works on git workflows.

There's some counterproductive stuff in there from my perspective but at its core you're keeping up a throwaway integration branch, which is helpful practice if you'll ever care about an integration. It's annoying with git because the interface for updating your throwaway integration branch is very clunky and easy to get wrong.