opendev
/
gerrit
Code Issues Proposed changes

Added explanation for "you are not allowed to upload merges" error 

Change-Id: I326dd2674ea893e09707ecf43e4f8d9f4cf906a0
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
Edwin Kempin 2011-04-11 09:14:01 +02:00
parent 4b1c2bfb5f
commit 19433418f7
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/error-messages.txt
View File

@ -31,6 +31,7 @@ Error Messages
* link:error-prohibited-by-gerrit.html[prohibited by Gerrit]
* link:error-squash-commits-first.html[squash commits first]
* link:error-upload-denied.html[Upload denied for project '...']
* link:error-not-allowed-to-upload-merges.html[you are not allowed to upload merges]
* link:error-you-are-not-author.html[you are not author ...]
* link:error-you-are-not-committer.html[you are not committer ...]

20
Documentation/error-not-allowed-to-upload-merges.txt Normal file
View File

@ -0,0 +1,20 @@
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 for this project permissions to upload
merge commits (access right '+3 Upload merges permission' in the
link:access-control.html#category_READ['Read Access'] category).
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]