You want to remove fast-forward and rebase from a graph based version control system? What would you do instead? Always merge?