2016-08-08 57 views
2

我修改了一些文件,作出了新的承諾,然後鍵入git pull 然後自動的git作出了新的合併提交,這是空的! 那麼我做了一個git rebase試圖擺脫它。 而空的提交已經消失。格里特重複請求駁回

但現在,當我做git review,我得到

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: 

←[33me4b3f96←[m←[33m (←[m←[1;36mHEAD←[m←[33m -> ←[m←[1;32mmaster←[m←[33m)←[m unit tester fixes 
←[33mbc61468←[m Addded test cases to ... 
←[33me21d8c7←[m Added test cases to the 
←[33ma8d2919←[m added another test case 
←[33m938ef4f←[m Modified a few tests 
←[33mbee5ba1←[m FA initial 

Do you really want to submit the above commits? 
Type 'yes' to confirm, other to cancel: yes 
remote: Resolving deltas: 100% (38/38) 
remote: Processing changes: refs: 1, done 
remote: (W) bc61468: commit subject >65 characters; use shorter first paragraph 
remote: (W) bc61468: commit message lines >70 characters; manually wrap lines 
To ssh://[email protected]:29418/IM 
! [remote rejected] HEAD -> refs/publish/master (duplicate request) 
error: failed to push some refs to 'ssh://[email protected]:29418/IM' 

我如何找出它爲什麼說重複的要求嗎?我不明白爲什麼會這樣。我嘗試了各種各樣的東西,但無濟於事。

回答

3

沒關係。 因此,我的提交「添加了另一個測試用例」具有與提交「修改了一些測試」相同的更改ID。我已經將修改ID設置爲相同,以便它在Gerrit上的提交下顯示爲一個修補程序集。 但是好像gerrit希望你把變更壓縮成一個提交。

所以我壓扁他們,現在我沒有得到重複的錯誤。