aef5d6e001
In the documentation the 'Push Merge Commit' access right was named 'Push Merge'. Correct the name to be consistent with the name that is displayed in the Gerrit WebUI. In addition remove the link to the 'Push' access right from the documentation of the error 'you are not allowed to upload merges'. When the user gets this error he has already the 'Push' access right assigned and only 'Push Merge Commit' is missing. If 'Push' would be missing the user would get an 'Upload Denied' error. Also the 'Push Merge Commit' documentation explains that it requires 'Push'. This means just having the link to 'Push Merge Commit' should be sufficiant for the 'you are not allowed to upload merges' error description. Change-Id: Idfec58e52ba77c967abb97deb6cc90f42c3395d9 Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
22 lines
810 B
Plaintext
22 lines
810 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_merge['Push Merge Commit'])
|
|
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]
|