Git refusing to merge unrelated histories on rebase

Question

During git rebase origin/development the following error message is shown from Git:

fatal: refusing to merge unrelated histories
Error redoing m         


        

Answer 1

git pull origin  --allow-unrelated-histories

You will be routed to a Vim edit window:

• Insert commit message
• Then press Esc (to exit "Insert" mode), then : (colon), then x (small "x") and finally hit Enter to get out of Vim
• git push --set-upstream origin