Last modified: 2013-08-28 19:59:42 UTC
When people accidentally upload merge commits, things can get very confusing. See https://gerrit.wikimedia.org/r/80483 Gerrit gets confused because it can't rebase the patch, because the merged commit is already applied, etc. Jenkins also seems to fail. So the result is a patch that can never be merged. We should just make 'git review' fail with a sensible error if the user tries to upload a merge commit.
I would not want to turn that capability off globally on our gerrit. Some people want to be able to upload merge commits. If merge commits cause more problems for your repos than they solve, you can disable pushing of merge commits on a per project basis in the Project's Access Tab within gerrit. Just revoke the “Push Merge Commit” capability; either for the whole project or just on some relevant refs.
