我正在尝试向
develop
分支
venmo
存储库
CC-132-Not-enough-balance-decline-notification
我的分支存储库位于
kupeek
远程的GitHub上的pr表示30个文件已更改:
但是,如果我只是做一个
git diff
在本地,我只看到16个文件发生了更改:
LM-SFP-21018636:venmo-android kupeek$ git branch
* CC-132-Not-enough-balance-decline-notification
CC-132-refactor
CC-132-use-generic-notification
CC-563-remove-shift-card-id
develop
LM-SFP-21018636:venmo-android kupeek$ git diff upstream/develop..HEAD --name-only | wc -l
16
在我做了一个
git fetch upstream develop
-也就是说,我非常肯定我正在将其与该分支的最新版本进行比较。
怎么会有差异呢?我做的是合并一个实验分支,
CC-132-refactor
同时重新平衡
upstream/develop
.
$ git log
commit f84a9a7f200c9ccf554b7cbea2ac988efa18f263
Author: Kurt Peek <kurt.peek@gmail.com>
Date: Mon Jan 28 13:45:47 2019 -0800
Fixed JSON trailing spaces
commit 9600b4b18fa3bcb319bf5c864a2f539cb749c896
Merge: 7ebde28 95669e8
Author: Kurt Peek <kurt.peek@gmail.com>
Date: Mon Jan 28 13:42:14 2019 -0800
Merge branch 'CC-132-refactor' into CC-132-Not-enough-balance-decline-notification
commit 7ebde28a87cdcebbc660a9749bc4b1b435af8d49
Author: Foo Bar <foo.bar@venmo.com>
Date: Mon Jan 28 12:21:00 2019 -0500
[CC-167] Push notification analytics for venmo card low balance decline.