Files
gerrit/Documentation/error-not-allowed-to-upload-merges.txt
Fredrik Luthander 5d976a0d86 Access control documentation: Read and Submit
Fine tuning the Read category, now that it's been stripped of all it's
legacy surplus features and is a pure read permission. Also purging
any old links to it that really should be push / push merge now.

Submit category has it's link changed.

Change-Id: I3fc7a181bb542cc647adb76df9a772f1fcfa6773
Signed-off-by: Fredrik Luthander <fredrik.luthander@sonyericsson.com>
2012-01-20 17:04:53 +01:00

23 lines
854 B
Plaintext

you are not allowed to upload merges
====================================
With this error message Gerrit rejects to push a merge commit if the
pushing user has no permissions to upload merge commits for the
project to which the push is done.
If you need to upload merge commits, you can contact one of the
project owners and request permissions to upload merge commits
(access right link:access-control.html#category_push['Push'] and
link:access-control.html#category_push_merge['Push merge']) for this
project.
If one of your changes could not be merged in Gerrit due to conflicts
and you created the merge commit to resolve the conflicts, you might
want to revert the merge and instead of this do a
link:http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html[rebase].
GERRIT
------
Part of link:error-messages.html[Gerrit Error Messages]