>git push origin master
To https://github.com/vfdddd/xxxxxxmjj.github.io.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/vxxxxxjj/vxxxxj.github.io.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.
反正就是git clone获得的数据不是最新的,很有可能在你拉过来的后一秒就进行更改了,然后你本地进行提交就会出现融合不了的情况也就是无法进行merge
解决:
首先进行git fetch 获取到最新的更改信息
然后进行融合 git merge origin/master
最后就可以进行正常的提交啦。