I have 'dev' branch and when I am trying to merge it in to 'pre-prod' via 'squash' I am getting next error:
On branch pre-prod Your branch is up to date with 'origin/pre-prod'. git merge --squash dev fatal: refusing to merge unrelated histories
2.1m questions
2.1m answers
60 comments
57.0k users