2014-03-12 14 views
0

我想發佈一個承諾,我已經做了,並推動之前必須rebase,現在我的分支是最新的,但當我做git審查它問一個問題:Gerrit推動審查答案更改...關閉

[user]$ git review *originbranch* 

**You are about to submit multiple commits. This is expected if you are 
submitting a commit that is dependent on one or more in-review 
commits. Otherwise you should consider squashing your changes into one 
commit before submitting.** 

The outstanding commits are: 

c7d455d A 
372b1b9 B 
27dea57 C 
1e600e2 D 
713422e E 
c84bea9 H 
7e2b81a I 

當我說是的結果是:

remote: Resolving deltas: 100% (223/223) 
remote: Processing changes: refs: 1, done  
To ssh://gerrit.hq.md.checkpoint.com:29418/ipssvc 
! [remote rejected] HEAD -> refs/publish/*originbranch*/CHANGE **(change 1298 closed)** 
error: failed to push some refs to 'ssh://URL' 

變化1298指的是改變d,它實際上是關閉的,但是是重訂基期的一部分,

幫助?

回答

1

您沒有正確重新綁定。因此,git review正嘗試上傳比您的更多提交。

您想要上傳多少個提交以供審覈?假設只有一個(A c7d455d),而你在主分支工作:

git fetch 
git checkout origin/master 
git cherry-pick c7d455d 

然後,您應該能夠像正常上傳。

如果您有多個提交上傳,您可以按順序挑選它們或使用git rebase