You have divergent branches and need to specify how to reconcile them

“git pull origin master” gives the error below

git add ./* && git commit -m "commit before merge" && git push

git checkout master && git fetch && git pull

git checkout redis-socketio && git merge master

git merge master

in the end, the line above is what fixes things