Jump to content

Topic on Talk:Gerrit/Troubleshooting

GTrang (talkcontribs)

I tried cloning the "REL1_31" core branch and then submitting a change for review, but while doing so, got several lines that say "remote: ERROR: Implicit Merge of" as well as one line that says "! [remote rejected] HEAD -> refs/publish/master/(branch name) (implicit merges detected)" and another line that says "error: failed to push some refs to 'ssh://geoffreytrang@gerrit.wikimedia.org:29418/mediawiki/core.git'". Perhaps, a new subsection about the "implicit merge" issue should be added under the "Miscellaneous" section.

Saper (talkcontribs)

1. Can you post the exact command used to publish the change?

2. Can you post the output of the command

   git log HEAD ^REL1_31

while you are on the branch containing your changes?

Saper (talkcontribs)

From the Gerrit documentation:

https://gerrit.googlesource.com/homepage/+show/030d29524d8a10bd534ecf41979d87731fef425d/releases/2.13.md#321

 * New project option to reject implicit merge commits.
 The 'Reject Implicit Merges' option can be enabled to prevent non-merge commits
 from implicitly bringing unwanted changes into a branch. This can happen for
 example when a commit is made based on one branch but is mistakenly pushed to
 another, for example based on refs/heads/master but pushed to refs/for/stable.

Most probably you are trying to push your commits to master (git push <gerrit> HEAD:refs/for/master) instead of submitting them to REL1_31 (git push <gerrit> HEAD:refs/for/REL1_31).

Reply to "Implicit merge errors"