这个‘git pull 将远程的和本地的合并一下。然后在 git push 试一下。’已经操作过了,之前使用github没有出现过这个问题
pull会显示'will pull 0 commit into zheye2,push会显示以下的错误信息,按照百度操作了一些但是还没有解决问题
[2022-07-08 03:39:56.951]
Failed to execute git {
"exitCode": 1,
"gitErrorCode": "PushRejected",
"gitCommand": "push",
"stdout": "",
"stderr": "To https://git.imooc.com/CoderCoke/zheye2.git\n ! [rejected] master -> master (non-fast-forward)\nerror: failed to push some refs to 'https://git.imooc.com/CoderCoke/zheye2.git'\nhint: Updates were rejected because the tip of your current branch is behind\nhint: its remote counterpart. Integrate the remote changes (e.g.\nhint: 'git pull ...') before pushing again.\nhint: See the 'Note about fast-forwards' in 'git push --help' for details.\n"
}