diff options
Diffstat (limited to 'Documentation/error-not-allowed-to-upload-merges.txt')
| -rw-r--r-- | Documentation/error-not-allowed-to-upload-merges.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/error-not-allowed-to-upload-merges.txt b/Documentation/error-not-allowed-to-upload-merges.txt index 9aa144a028..981ba91ccc 100644 --- a/Documentation/error-not-allowed-to-upload-merges.txt +++ b/Documentation/error-not-allowed-to-upload-merges.txt @@ -7,9 +7,8 @@ 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['Push'] and -link:access-control.html#category_push_merge['Push merge']) for this -project. +(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 |