This is an old revision of the document!
Git Cheat Sheet
Merge Unrelated Histories
Usually happens when just create new repo in Bitbucket and auto create .gitignore. It will conflict with our local repo which hasn't been registered in any external repo.
The error is resolved by toggling the allow-unrelated-histories switch. After a git pull or git merge command, run the following command:
git pull http://bitbucket.org/etcetc master --allow-unrelated-histories