Discussion

Isaac Corbrey

grim_io: 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: Awesome! Tbh other than GitButler idk where I'd even start if I had to recreate this with vanilla Git

taberiand: 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?

icorbrey: 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

nchmy: 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 jjI proposed incorporating some of this article into it. https://github.com/idursun/jjui/discussions/644