diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-16 03:08:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-16 03:08:56 +0300 |
| commit | 3682a3a317e423498bfe56c38d21c6381b8ad04b (patch) | |
| tree | 890d76d74b5b64f8d0973b9da1bdd3b4f6d36705 /doc/api/merge_requests.md | |
| parent | c083f926c5714ee4dcbb3ae497b14d4cb31aa794 (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 944a5530100..e15387e3f39 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -1310,7 +1310,7 @@ curl --request DELETE --header "PRIVATE-TOKEN: <your_access_token>" "https://git Merge changes submitted with MR using this API. -If merge request is unable to be accepted (ie: Draft, Closed, Pipeline Pending Completion, or Failed while requiring Success) - you'll get a `405` and the error message 'Method Not Allowed' +If merge request is unable to be accepted (such as Draft, Closed, Pipeline Pending Completion, or Failed while requiring Success) - you'll get a `405` and the error message 'Method Not Allowed' If it has some conflicts and can not be merged - you'll get a `406` and the error message 'Branch cannot be merged' |