new git user here, been using it for about 4 months. I am not a developer, more of an integrator. I integrated extensions into Magento stores and perform basic customizations, hotfixes and deployment, and I work by myself.
When I started using Git, I figured I would use a basic workflow:
Master branch, pushed to github, holds production version of site
Dev branch, local only, ongoing development of site
Feature branches as needed
I must of ran a bad command in my very early days, because the master and dev branches that I have are apparently unrelated. When I run
git checkout master git merge dev
I get the error:
fatal: refusing to merge unrelated histories
Since I was always in development and never in production, this is the first time I try to merge to Master. I know there is nothing special about the Master branch, it’s just a branch like any other, but how can I fix this situation?