Just make a normal commit with the changes, then do a normal rebase, then you can do an interactive rebase, if you wish, to combine/take out commits. We need rebases here to get the PR into a mergable state so that Travis runs.