diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-08 06:09:41 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-08 06:09:41 +0300 |
| commit | 0c8e6bebbb74c8b3f9acf1b685851621e386296c (patch) | |
| tree | fb7a07742048dab0b59d37b28b48dd70f0374c63 /doc/api/merge_requests.md | |
| parent | 9a594bf0e355eadfd6d9d2c7abc635e4611f3258 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api/merge_requests.md')
| -rw-r--r-- | doc/api/merge_requests.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index f7e6e2913f6..0c065c0f2f5 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -1629,7 +1629,7 @@ This API returns specific HTTP status codes on failure: |:------------|--------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------| | `401` | `Unauthorized` | This user does not have permission to accept this merge request. | | `405` | `Method Not Allowed` | The merge request cannot be accepted because it is `Draft`, `Closed`, `Pipeline Pending Completion`, or `Failed`. `Success` is required. | -| `406` | `Branch cannot be merged` | The merge request can not be merged. | +| `406` | `Branch cannot be merged` | The branch has conflicts and cannot be merged. | | `409` | `SHA does not match HEAD of source branch` | The provided `sha` parameter does not match the HEAD of the source. | For additional important notes on response data, read [Single merge request response notes](#single-merge-request-response-notes). |