Test branch merging, with multiple commits and a rebase