Comment by SkyPuncher

Isn't that what rebasing is for?

We rebase all of our feature branches for PR's.