我正在使用两个分支测试和主要。
所以,在主分支上,我做了:
git merge test
一切都很顺利。所有的变化都合并了。
然后将其推送到远程 main ,我做了:
git push
但似乎没有做任何事,它说:
Total 0 (delta 0), reused 0 (delta 0)
To git@github.com:Company/My-App.git
b878c9d..0dc7fbe main -> main
我不认为如果推进确实很好的话,它应该在上面显示为零。
如何推送主分支?
答案 0 :(得分:4)
这只是意味着git不会写任何对象。当所有对象都已经在远程时,并且当您合并时,只需将标签'main'移动到最新提交即可。我刚做了一个快速测试来证明:
~/workspace
$ git clone git@github.com:korin/test_merge.git
Cloning into 'test_merge'...
remote: Counting objects: 3, done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Receiving objects: 100% (3/3), done.
~/workspace
$ cd test_merge
~/workspace/test_merge
$ git co -b test
Switched to a new branch 'test'
~/workspace/test_merge
$ echo 'a' > a
~/workspace/test_merge
$ git add .
~/workspace/test_merge
$ git ci -m 'a'
[test 9953350] a
1 file changed, 1 insertion(+)
create mode 100644 a
~/workspace/test_merge
$ git push --set-upstream origin test
Counting objects: 4, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 273 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To git@github.com:korin/test_merge.git
* [new branch] test -> test
Branch test set up to track remote branch test from origin.
~/workspace/test_merge
$ g co master
Switched to branch 'master'
~/workspace/test_merge
$ g merge test
Updating f5e0184..9953350
Fast-forward
a | 1 +
1 file changed, 1 insertion(+)
create mode 100644 a
~/workspace/test_merge
$ g push
Total 0 (delta 0), reused 0 (delta 0)
To git@github.com:korin/test_merge.git
f5e0184..9953350 master -> master