git 为什么我的分支比origin/master提前了太多的提交?

fhity93d  于 2023-01-07  发布在  Git
关注(0)|答案(1)|浏览(303)

在我现在正在做的项目中,我刚刚提交了一个合并请求,这个请求已经被合并到了master文件中(我们的gitlab服务器),之后我提交了一个修改错误的请求,并手动将我的分支合并到了master文件中(请不要杀我)。
现在,我对运行git status时得到的消息感到困惑:

On branch master
Your branch is ahead of 'origin/master' by 15 commits.
  (use "git push" to publish your local commits)

nothing to commit, working tree clean

因为据我所知,我的本地master分支只提前了3次提交,这是git log -n5的输出(稍作修改):

commit cdbbbfdaf55deef575914f2cbf8cfec549479973 (HEAD -> master)
Merge: bc1a6b9 a32002a
Author: Developer 1 (me)
Date:   Wed Jan 4 11:03:45 2023 +0100

    Merge into master

commit a32002a75a559943968d8694287dc16b1297e1cf (development-branch)
Author: Developer 1 (me)
Date:   Wed Jan 4 11:02:36 2023 +0100

    Fixed typo

commit bc1a6b9ba9b56063044730fb20cc5f1b43194dea (origin/master, origin/HEAD)
Merge: 91f3302 eabfd24
Author: Developer 2
Date:   Wed Jan 4 09:33:41 2023 +0000

    Merge branch 'development-branch' into 'master'
    
    Development branch
    
    See merge request Repository!7

commit eabfd244f4791b66cf4c26a9fb574c9317279021
Author: Developer 1 (me)
Date:   Wed Jan 4 09:33:41 2023 +0000

    Development branch

commit 9eb2390feec6650a446bff4e9309bd29c7ed18e8 (origin/development-branch)
Merge: 2517a68 91f3302
Author: Developer 1 (me)
Date:   Wed Jan 4 10:26:37 2023 +0100

    Merge

一个git pull说一切都是最新的,为什么会有这种差异呢?

编辑

正如@florieger所指出的,git log origin/master..master的输出显示了15次提交,其中前三次是:

commit cdbbbfdaf55deef575914f2cbf8cfec549479973 (HEAD -> master)
Merge: bc1a6b9 a32002a
Author: Developer 1 (me)
Date:   Wed Jan 4 11:03:45 2023 +0100

    Merge into master

commit a32002a75a559943968d8694287dc16b1297e1cf (development-branch)
Author: Developer 1 (me)
Date:   Wed Jan 4 11:02:36 2023 +0100

    Fixed typo

commit 9eb2390feec6650a446bff4e9309bd29c7ed18e8 (origin/development-branch)
Merge: 2517a68 91f3302
Author: Developer 1 (me)
Date:   Wed Jan 4 10:26:37 2023 +0100

    Merge

(12 additional commits not shown)

例如在git log -n5中提交1、2和5。但是为什么合并(bc1a6)在这里不可见?git log -n5的输出在我看来似乎暗示了origin/master指向这个引用,那么为什么它们不同呢?

gupuwyp2

gupuwyp21#

1.确保您位于本地master分支上。
1.运行git log origin/master..master
它应该会列出你所有的15个提交之间的起源/主分支和本地主分支。

相关问题