Re:Jujutsu at Google • Martin von Zweigbergk JJ Con [video]
by verdverm on Thursday October 30, 2025 @08:16PM
(#45766981)
What if we don't use git rebase at all? What does jj have to offer us?
Re:Jujutsu at Google • Martin von Zweigbergk JJ Con [video]
by zhivota on Thursday October 30, 2025 @09:10PM
(#45767307)
Yes, I don't rebase, I only merge. We squash commits on merge of MR/PR anyway, so there is no value to rebase for us AFAICT. It also removes a ton of gnarly situations you can find yourself in when you mess up a rebase somehow.
Here: git rebase is slightly broken in conflict handling. It can be made simpler to understand with jj.