Jujutsu megamerges for fun and profit
52 points by icorbrey 2 hours ago | 13 comments
VerTiGo_Etrex 50 minutes 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.
replynvahalik 44 minutes ago
Great article, Isaac!
replyIf anyone is JJ-curious, I also can't recommend the Discord[1] enough. The community is very helpful and welcoming.
juped 8 minutes ago
It's interesting to see the strange workflows that come from jujutsu users, as someone who works on git workflows.
replyThere'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.
grim_io 54 minutes 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!
replytaberiand 46 minutes 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?
replyicorbrey 36 minutes 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
reply
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