Git no new changes
Git remote rejected
·
Git remote rejected
在把代码推送到temp分支之后,没有做任何修改推送到dev分支,发生了以下问题:
$ git push origin dev
Total 0 (delta 0), reused 0 (delta 0)
remote Processing changes refs 1, done
To xxx
! [remote rejected] HEAD - xxx (no new changes)
error failed to push some refs to 'xxx'
我们可以查看此时的提交日志:
$ git log
commit ae4bd331d02ff806281482ed0ad3b7f5422c57c6 (HEAD)
Author: = <jing@xxx.com>
Date: Thu Oct 20 17:57:25 2022 +0800
[ADD] 增加系统语言
注意:在将代码提交到temp分支用的commit ID就是当前的ae4bd331d02ff806281482ed0ad3b7f5422c57c6
,所以我们将代码提交到其他分支时commit ID重复,由此远程仓库拒绝推送代码。
有两种解决方法:
-
代码回退到上次commit版本,重新修改代码、提交。(因为没有新的代码修改,所以我们直接用第二种方法。)
-
修改commit信息。(修改之后会自动生成新的commit ID,因为我们的注释信息不需要编辑,所以加上
--no-edit
。)$ git commit --amend --no-edit [detached HEAD 0be0c58] [DTV03661821][] Add system language Date: Thu Oct 20 17:57:25 2022 +0800 2 files changed, 2 insertions(+), 2 deletions(-) $ git log commit 0be0c589564f09bc96403aef5775c6c0e13a5be0 (HEAD) Author: = <jing@xxx.com> Date: Thu Oct 20 17:57:25 2022 +0800 [ADD] 增加系统语言
再次将代码推送到dev分支:
$ git push origin dev
Enumerating objects: 11, done.
Counting objects: 100% (11/11), done.
Delta compression using up to 64 threads
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 598 bytes | 598.00 KiB/s, done.
Total 6 (delta 5), reused 0 (delta 0)
remote: Resolving deltas: 100% (5/5)
remote: Processing changes: refs: 1, new: 1, done
remote:
remote: SUCCESS
remote:
remote: xxx
remote:
To xxx
* [new branch] HEAD -> dev
更多推荐
已为社区贡献4条内容
所有评论(0)