[Git]个人分支推个人分支:合并冲突

常说的先拉再推,先pull再push

遇到问题:

! [rejected] dev-fl -> dev-fl (non-fast-forward)

error: failed to push some refs to ‘....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 add 和 git commit 已经执行成功

git status (显示个人分支),下面依次执行下面三个

git pull origin master

git pull origin dev

git push origin dev-fl 

分支推送成功。

最后编辑于
©著作权归作者所有,转载或内容合作请联系作者
平台声明:文章内容(如有图片或视频亦包括在内)由作者上传并发布,文章内容仅代表作者本人观点,简书系信息发布平台,仅提供信息存储服务。