git push 报错!!!!

本文记录了一次使用Git过程中遇到的非快进更新问题及其解决过程。问题表现为尝试推送更改到远程仓库时被拒绝,通过拉取远程更改并解决冲突后再推送成功解决了该问题。

摘要生成于 C知道 ,由 DeepSeek-R1 满血版支持, 前往体验 >

 

[root@NB sh]# git push
To git@x0.xx.xxx.x1:yanjing_chenl/IT-DOC.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'git@xx.x.x.x1:yanjing_chenl/IT-DOC.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again.  See the 'Note about
fast-forwards' section of 'git push --help' for details.

之前我直接在gitlab上做了改修保,而不是在本地提交的所以有问题

[root@NB sh]# git pull
remote: Counting objects: 4, done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 4 (delta 2), reused 0 (delta 0)
Unpacking objects: 100% (4/4), done.
From xx.xx.xx.x1:yanjing_chenl/IT-DOC
   3152d76..75ffcb1  master     -> origin/master
Auto-merging sh/GUOER.SH
Merge made by recursive.
 sh/GUOER.SH |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

再次提交问题解决:

[root@NB sh]# git push
Counting objects: 14, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (8/8), done.
Writing objects: 100% (8/8), 893 bytes, done.
Total 8 (delta 4), reused 0 (delta 0)
To git@xx.xx.xx.x1:yanjing_chenl/IT-DOC.git
   75ffcb1..03424a3  master -> master

 

转载于:https://www.cnblogs.com/bass6/p/6246000.html

评论
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值