git review報錯一例

線上上修改代碼，最後使用git review送出代碼稽核的時候出現報錯如下：

[wangshibo@115~]$ vim testfile           #修改代碼

[wangshibo@115~]$ git add testfile 

[wangshibo@115~]$ git commit -m "123"

[wangshibo@115~ ]$ git review

Errors running git rebase -i remotes/gerrit/master

Interactive rebase already started

.....

解決辦法：

[wangshibo@115~]$ git review -v

2016-07-19 15:37:49.838087 Running: git log --color=never --oneline HEAD^1..HEAD

2016-07-19 15:37:49.841756 Running: git remote

2016-07-19 15:37:49.844743 Running: git branch -a --color=never

2016-07-19 15:37:49.847957 Running: git rev-parse --show-toplevel --git-dir

2016-07-19 15:37:49.850729 Running: git remote update gerrit

Fetching gerrit

2016-07-19 15:37:49.962033 Running: git rebase -i remotes/gerrit/master

使用“git rebase -i --abort”指令重來：

[wangshibo@115~]$ git rebase -i --abort

2016-07-19 15:39:02.470947 Running: git log --color=never --oneline HEAD^1..HEAD

2016-07-19 15:39:02.474624 Running: git remote

2016-07-19 15:39:02.477638 Running: git branch -a --color=never

2016-07-19 15:39:02.480825 Running: git rev-parse --show-toplevel --git-dir

2016-07-19 15:39:02.483649 Running: git remote update gerrit

2016-07-19 15:39:02.595045 Running: git rebase -i remotes/gerrit/master

Automatic cherry-pick failed. After resolving the conflicts,

mark the corrected paths with 'git add <paths>', and

run 'git rebase --continue'

Could not apply 0e37bdc... test

[wangshibo@115~]$ git rebase --continue                 # 繼續變基并且傳回到原來的HEAD處

[detached HEAD d854154] test

1 files changed, 4 insertions(+), 0 deletions(-)

Successfully rebased and updated refs/heads/master.

# On branch master

# Your branch is ahead of 'origin/master' by 1 commit.

#

nothing to commit (working directory clean)

最後再次git review就成功了

[wangshibo@115~]$ git review

remote: Resolving deltas: 100% (1/1)

remote: Processing changes: new: 1, refs: 1, done 

remote: 

remote: New Changes:

remote: http://103.10.86.30:80/16 test

To ssh://[email protected]:29418/xqsj_android.git

* [new branch] HEAD -> refs/publish/master

***************當你發現自己的才華撐不起野心時，就請安靜下來學習吧***************

本文轉自散盡浮華部落格園部落格，原文連結：http://www.cnblogs.com/kevingrace/p/5685226.html，如需轉載請自行聯系原作者