chg: pull --rebase the branches of interest, this should avoid issues with modified...