Comment by Deadron

Just do a normal merge, then squash all your commits in into one, using rebase, then a rebase onto a branch is easy.