
Troubleshooting
Git Merge Unrelated Histories with Conflicts: How to Resolve
You try to merge two git branches and get an error like fatal: refusing to merge unrelated ...