During git rebase origin/development the following error message is shown from Git:
git rebase origin/development
fatal: refusing to merge unrelated histories Error redoing m
I struggled with this as well, but I managed to find a workaround.
When you run into the error above, just cherry-pick the merge commit and then continue the rebase:
git cherry-pick -m 1 1234deadbeef1234deadbeef git rebase --continue