SyntaxFix
Write A Post
Hire A Developer
Questions
You should use git pull, that´s command do a git fetch and next do the git merge.
git pull
git fetch
git merge
If you use a git push origin master --force command, you may have problems in the future.
git push origin master --force