解决 You are not currently on a branch

将分支内容覆盖到master分上

git push origin HEAD:master --force

也可以创建一个临时分支再合并到主的分支上

git branch temp-branch
git checkout master
git merge temp-branch
git push origin master