执行git pull显示already up-to-date,但是本地代码并没有显示出来其他人的改动
·
如题
之后我再push我的代码就报错,错误信息如下,但是pull、fetch又显示已是最新,令人头秃
To http://git.sankuai.com/scm/myfe/canary.git
! [rejected] feature/double_redpack1.2 -> feature/double_redpack1.2 (non-fast-forward)
error: failed to push some refs to 'http://lurui05@git.sankuai.com/scm/myfe/canary.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.
![在这里插入图片描述](https://img-blog.csdnimg.cn/20190722171724710.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzM1NzY1MTI2,size_16,color_FFFFFF,t_70最后这么解决了
对git非常不了解,所以有知道原因的大神欢迎补充
更多推荐
已为社区贡献2条内容
所有评论(0)