icorbrey

6 ms·

1.
by icorbrey 5mo ago
If you inspect a GitButler repo with JJ you can see that it's topologically identical actually! https://bsky.app/profile/isaaccorbrey.com/post/3m33wrahz4222
2.
by icorbrey 5mo ago
Fwiw I've not had this experience, I use megamerges in teams of 8+ devs without much issue
3.
by icorbrey 5mo ago
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
4.
by icorbrey 5mo ago
Thanks!
5.
by icorbrey 5mo 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
6.
by icorbrey 5mo ago
Awesome! Tbh other than GitButler idk where I'd even start if I had to recreate this with vanilla Git
7.
by icorbrey 5mo ago
Look man life gets busy and I'm horrible at accepting "good enough" lol
8.
Jujutsu megamerges for fun and profit(isaaccorbrey.com)
265 points by icorbrey 5mo ago|167 comments
9.
by icorbrey 5mo ago
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 u
10.
by icorbrey 10mo ago
Not sure on `jj init`, but yeah colocation is default as of I believe 0.34
11.
by icorbrey 10mo ago
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
12.
by icorbrey 1y ago
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 obviou