在我的项目中,我尝试从git服务器中提取。在一些变化后,我添加然后提交,但当我想添加我得到此消息
PS D:\Projects\NAPServer> git add *
server/log/log/dashboardAppLog.log: Permission denied
PS D:\Projects\NAPServer>
当我尝试推送时,我收到此消息:
PS D:\Projects\NAPServer> git push origin master
To http://192.168.1.201:80/Bonobo.Git.Server/NAPServer.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'http://192.168.1.201:80/Bonobo.Git.Server/NAPServer.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
PS D:\Projects\NAPServer>
我尝试拉,但它不起作用。我无法删除或重命名文件。
更新
我的git状态是:
PS D:\Projects\NAPServer> git status
server/log/log/dashboardAppLog.log: Permission denied
On branch master
Your branch and 'origin/master' have diverged,
and have 4 and 7 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
nothing to commit, working directory clean
PS D:\Projects\NAPServer>