git push时出现错误refusing to update checked out branch: refs/heads/master

错误描述

使用tortoisegit push的时候如下错误



Writing objects: 100% (3/3), 258 bytes | 0 bytes/s, done.

Total 3 (delta 0), reused 0 (delta 0)

remote: error: refusing to update checked out branch: refs/heads/master

remote: error: By default, updating the current branch in a non-bare repository

remote: error: is denied, because it will make the index and work tree inconsistent

remote: error: with what you pushed, and will require 'git reset --hard' to match

remote: error: the work tree to HEAD.

remote: error:

remote: error: You can set 'receive.denyCurrentBranch' configuration variable to

remote: error: 'ignore' or 'warn' in the remote repository to allow pushing into

remote: error: its current branch; however, this is not recommended unless you

remote: error: arranged to update its work tree to match what you pushed in some

remote: error: other way.

remote: error:

remote: error: To squelch this message and still keep the default behaviour, set

remote: error: 'receive.denyCurrentBranch' configuration variable to 'refuse'.

To ssh://gitadmin@122.114.88.133:22/ICW/home/gitadmin/testgit

! [remote rejected] master -> master (branch is currently checked out)

error: failed to push some refs to 'ssh://gitadmin@122.114.88.133:22/ICW/home/gitadmin/testgit'

git did not exit cleanly (exit code 1) (9033 ms @ 2016/11/21 13:48:04)

上面原因是因为远程仓库创建的时候没有使用—bare选项

第一种方法:

解决这个冲突需要将远程仓库当前分支切换到其他分支（如谁也不会使用的分支），

第二种方法：

这是由于git默认拒绝了push操作，需要进行设置，修改.git/config添加如下代码：

[code=xml;toolbar:false ace_editor inited ace-monokai ace_dark" id="runcode0">