| Edwin Kempin | 1943341 | 2011-04-11 09:14:01 +0200 | [diff] [blame] | 1 | you are not allowed to upload merges |
| 2 | ==================================== |
| 3 | |
| 4 | With this error message Gerrit rejects to push a merge commit if the |
| 5 | pushing user has no permissions to upload merge commits for the |
| 6 | project to which the push is done. |
| 7 | |
| 8 | If you need to upload merge commits, you can contact one of the |
| Fredrik Luthander | 5d976a0 | 2012-01-20 13:06:06 +0100 | [diff] [blame] | 9 | project owners and request permissions to upload merge commits |
| Edwin Kempin | aef5d6e | 2012-01-24 09:04:54 +0100 | [diff] [blame^] | 10 | (access right link:access-control.html#category_push_merge['Push Merge Commit']) |
| 11 | for this project. |
| Edwin Kempin | 1943341 | 2011-04-11 09:14:01 +0200 | [diff] [blame] | 12 | |
| 13 | If one of your changes could not be merged in Gerrit due to conflicts |
| 14 | and you created the merge commit to resolve the conflicts, you might |
| Fredrik Luthander | 5d976a0 | 2012-01-20 13:06:06 +0100 | [diff] [blame] | 15 | want to revert the merge and instead of this do a |
| 16 | link:http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html[rebase]. |
| Edwin Kempin | 1943341 | 2011-04-11 09:14:01 +0200 | [diff] [blame] | 17 | |
| 18 | |
| 19 | GERRIT |
| 20 | ------ |
| 21 | Part of link:error-messages.html[Gerrit Error Messages] |
