JJ rebase coupled with committable conflicts is very much superior to git.