To http://git.text.com:9988/text.git
 ! [rejected]        dev -> dev (non-fast-forward)
 ! [rejected]        feature.import_setting_view -> feature.import_setting_view (non-fast-forward)
error: failed to push some refs to 'http://git.text.com:9988.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 push时候,git自己选择dev分支合并到dev分支,莫名其妙

方法一:打开gitlab 网站,找到merge request里面自己提交的合并分支删除,重新上传,再次在git 命令里面git push就ok了

方法二:在git 命令窗口输入git push 自己分支的路径//比如origin feature_view

 如果还不行在上面命令基础上,后面加个-f

问题解决

Logo

开放原子开发者工作坊旨在鼓励更多人参与开源活动,与志同道合的开发者们相互交流开发经验、分享开发心得、获取前沿技术趋势。工作坊有多种形式的开发者活动,如meetup、训练营等,主打技术交流,干货满满,真诚地邀请各位开发者共同参与!

更多推荐