From 5eddfe2cfe027f92cb5977644f422f27fe399dc7 Mon Sep 17 00:00:00 2001 From: Maxime Guyot Date: Thu, 26 Apr 2018 10:17:35 +0200 Subject: [PATCH] Remove double documentation --- doc/api/projects.md | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/doc/api/projects.md b/doc/api/projects.md index 2e42e5039cbc2b..119af1c596ed55 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -16,20 +16,6 @@ Values for the project visibility level are: * `public`: The project can be accessed without any authentication. -## Project merge method - -There are currently three options for `merge_method` to choose from: - -* `merge`: - A merge commit is created for every merge, and merging is allowed as long as there are no conflicts. - -* `rebase_merge`: - A merge commit is created for every merge, but merging is only allowed if fast-forward merge is possible. - This way you could make sure that if this merge request would build, after merging to target branch it would also build. - -* `ff`: - No merge commits are created and all merges are fast-forwarded, which means that merging is only allowed if the branch could be fast-forwarded. - ## Project merge method -- GitLab