git push origin master出错

Question

报错如下,请问老师该如何解决,

Administrator@PC201607172310 MINGW64 /e/node/ice-s (master)

$ git push origin master

To [e-mail]:issmile/ice.git

 ! [rejected]        master -> master (non-fast-forward)

error: failed to push some refs to '[e-mail]:issmile/ice.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.

Answer 1

Scott 2017-08-06 12:24:22

本地跟线上没有合并成最新版代码。本地这样操作一下：

git fetch

git merge origin/master

git push origin master