Hacker News: icorbrey

New comment by icorbrey in "Jujutsu megamerges for fun and profit"

icorbrey — Tue, 21 Apr 2026 01:22:32 +0000

Fwiw I've not had this experience, I use megamerges in teams of 8+ devs without much issue

New comment by icorbrey in "Jujutsu megamerges for fun and profit"

icorbrey — Tue, 21 Apr 2026 00:03:43 +0000

Re: commit dates, fundamentally those always change when rebasing because you're rewriting the commit object, but we don't touch the author date unless you explicitly reset it with metaedit

New comment by icorbrey in "Jujutsu megamerges for fun and profit"

icorbrey — Mon, 20 Apr 2026 23:50:43 +0000

Thanks!

New comment by icorbrey in "Jujutsu megamerges for fun and profit"

icorbrey — Mon, 20 Apr 2026 22:40:38 +0000

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

New comment by icorbrey in "Jujutsu megamerges for fun and profit"

icorbrey — Mon, 20 Apr 2026 22:25:35 +0000

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

New comment by icorbrey in "Jujutsu megamerges for fun and profit"

icorbrey — Mon, 20 Apr 2026 21:43:13 +0000

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

Jujutsu megamerges for fun and profit

icorbrey — Mon, 20 Apr 2026 21:32:10 +0000

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

Comments URL: https://news.ycombinator.com/item?id=47841129

Points: 225

# Comments: 110

New comment by icorbrey in "jj – the CLI for Jujutsu"

icorbrey — Tue, 14 Apr 2026 14:39:33 +0000

Fwiw I generally solve this by using `jj commit` instead of `jj desc` unless I'm specifically targeting something that isn't my working copy. Technically it violates the "we want commands to be orthogonal" guideline we use to write Jujutsu (otherwise this would indeed be `jj desc; jj new`) but as a habit it's never let me down

New comment by icorbrey in "The lazy Git UI you didn't know you need"

icorbrey — Tue, 11 Nov 2025 13:15:59 +0000

Not sure on `jj init`, but yeah colocation is default as of I believe 0.34

New comment by icorbrey in "The lazy Git UI you didn't know you need"

icorbrey — Tue, 11 Nov 2025 13:12:46 +0000

Indeed, though I don't think it can create fixup commits if that's what you're looking for. However, it might work great for that if you pair it with jj-spr: https://github.com/LucioFranco/jj-spr

New comment by icorbrey in "Jujutsu for busy devs"

icorbrey — Tue, 22 Jul 2025 19:33:41 +0000

Megamerges are awesome, but what really makes them magical is when you start using `jj absorb`, which automatically splits and squashes your commit down to the nearest unambiguous commits and leaves anything that doesn't have an obvious place to live