Jujutsu megamerges for fun and profit
isaaccorbrey.com
Jujutsu megamerges for fun and profit
1–10 of 175 posts
Re: Jujutsu megamerges for fun and profit
#2Finally
Re: Jujutsu megamerges for fun and profit
#3Finally
Look man life gets busy and I'm horrible at accepting "good enough" lol
Re: Jujutsu megamerges for fun and profit
#4this 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.
Re: Jujutsu megamerges for fun and profit
#5If this works like I think it does, it might be the missing piece I've been waiting for, for actually trying jj. Thanks!
Re: Jujutsu megamerges for fun and profit
#6If this works like I think it does, it might be the missing piece I've been waiting for, for actually trying jj. Thanks!
Awesome! Tbh other than GitButler idk where I'd even start if I had to recreate this with vanilla Git
Re: Jujutsu megamerges for fun and profit
#7Makes 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.
Re: Jujutsu megamerges for fun and profit
#8How does the megamerge handle the case where two included branches overlap in changes and a new commit is made that applies to the overlap?
Re: Jujutsu megamerges for fun and profit
#9Great article, Isaac!
If anyone is JJ-curious, I also can't recommend the Discord[1] enough. The community is very helpful and welcoming.