git櫻桃採摘原因分支提前/主

Question

我想合併特定提交從分支到主，並推送他們到原點。

下面是我在做什麼：

M4600 ~/git/plutext/docx4j (master) 
$ git reset --hard origin/master 
HEAD is now at 2b2d124 Image support in non-XSLT HTML export. 

M4600 ~/git/plutext/docx4j (master) 
$ git status 
# On branch master 
nothing to commit (working directory clean) 

M4600 ~/git/plutext/docx4j (master) 
$ git cherry-pick d89cc32b11d338c0874838a730f04f83c85021bd 
[master cb6bf93] Make table output work again. 
1 files changed, 11 insertions(+), 11 deletions(-) 

M4600 ~/git/plutext/docx4j (master) 
$ git status 
# On branch master 
# Your branch is ahead of 'origin/master' by 1 commit. 
# 
nothing to commit (working directory clean) 

我要去哪裏錯了？

Answer 1

沒有任何問題。

您只需將一個提交應用於您的本地主服務器，因此它現在比起始/主服務器（遠程分支）多一個，因此您只需要將其提交即可。