[tdiff]

Hard part is keeping the feature branches orthogonal and maintaing all the -base branches. Every fixup commit would invalidate them.