61698b14e0
We previous use the section title style like: Section level 1 =============== Section level 2 --------------- Which have a problem in Asciidoctor that the number of "="s or "-"s must match the number of characters in the header exactly, as a result it's easy to make mistakes while changing the titles. Asciidoctor provides a better style like: = Section level 1 == Section level 2 So we switched to this style. Also fixed a bug in replace_macros.py, which will not cause any problem in the old style. Change-Id: I811dd7238735d98f662767c17086152cd69aea02
24 lines
794 B
Plaintext
24 lines
794 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]
|
|
|
|
SEARCHBOX
|
|
---------
|