[kubanczyk]

> So, what am I missing?

Here: git rebase is slightly broken in conflict handling. It can be made simpler to understand with jj.

[verdverm]

What if we don't use git rebase at all? What does jj have to offer us?

[zhivota]

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.

[kubanczyk]

But I'm not offering anything to you. Unless there's a budget, in which case I will make that svn fly in circles over your enterprise, dear sir.