写在前面的:在develop分支上创建了zxy分支来开发
问题描述:在zxy开发完了后 准备执行git push origin zxy ,执行完后提示
To http://git.xxxxx.com/static.git
! [rejected] Zxy -> Zxy (non-fast-forward)
error: failed to push some refs to 'http://git.xxxxx.com/static.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.
(x掉了一些东西)
看到上述提示 ,自己先执行了 git pull 但是提示
Already up-to-date.
蒙蔽了…..
解决办法:
重新在develop分支上创建一个别的分支开发。。。