Gerrit appears submitted, merge Pending and merge Conflict

One: Submitted, Merge pending solution

Cause:

For example:

Reason 1>

(1) I submitted a new project to Gerrit, called Commit1, this commit1 I did not submit to the branch

(2) I then submitted a commit2 in the original compiler.

(3) At this time I review commit2 this record, add 2 points, then I click on the submit Merge code will report this error. Only after merging commit1 into the branch, can commit2 submit.

Reason 2>

(1) In a complete project, I first commit1, the second commit2, the third commit3, these are commit3,commit2.comimt1 in turn dependent, this situation is mostly.

(2) Commit3 was review, add 2 points, click Submit, this will also appear submitted, Merge Pending

Workaround:

Cause 1 Solutions >

1. Click Submit is invalid

2. The New Gerrit Web page Click Cherry-pick, the old version click Cherry Pick to if can merge, indicating that you are very diao.

3. If you cannot merge to indicate that your commit relies on the code previously submitted by someone else, you can only wait for the COMMIT1 code to submit.

Cause 2 Solutions >

1. Click Submit is invalid

2. Click Cherry-pick it is possible to merge successfully, but conflict can occur, then resolve the conflict commit.

II: Submitted, Merge Pending see which files are dependent, need to use the old version of Gerrit to see, all need to be set, the article finally wrote how to change Gerrit view version

Three: Toggle the old version of Gerrit view

Enter Settings--preferences--change view--Select old screen--save changes re-enter the record that you just commit

Gerrit appears submitted, merge Pending and merge Conflict