It's okay. I usually just rebase and the merge with `--no-ff` so it's easy to see what was changed on each pull request.