Add note to todo log when doing a branch switch in a preserve merge
Rework rewriting logic