gerrit/Documentation/error-not-allowed-to-upload-merges.txt
David Pursehouse 221d4f6250 Documentation: Various corrections
Correct typos, spelling mistakes, and grammatical errors.

Change-Id: I80ec66de7b2228f9ff45a2f06faf576707195758
2012-06-12 14:54:54 +02:00

22 lines
808 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 permission 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 permission 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]