Then rebase interactive is your friend. Clean up your feature branch BEFORE merging in to the release branch.