I think you have committed in the remote repository, and when you pull, this error happens.
Use this command:
git pull origin master --allow-unrelated-histories
git merge origin origin/master
I think you have committed in the remote repository, and when you pull, this error happens.
Use this command:
git pull origin master --allow-unrelated-histories
git merge origin origin/master