diff options
author | Ben Bodenmiller <bbodenmiller@hotmail.com> | 2019-08-21 09:16:17 +0300 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-21 09:16:17 +0300 |
commit | cc5f51970ab6bb8212b52e954bf66e6e9f9cc11b (patch) | |
tree | ca3008e0e1a694e6fbf3df986d5bee96cec6d5c3 | |
parent | da573ae259f132e8a557001f54d58037f2534753 (diff) |
Improve details about when rebase button is offered
-rw-r--r-- | doc/user/project/merge_requests/fast_forward_merge.md | 10 | ||||
-rw-r--r-- | doc/user/project/merge_requests/img/ff_merge_mr.png | bin | 0 -> 21380 bytes |
2 files changed, 8 insertions, 2 deletions
diff --git a/doc/user/project/merge_requests/fast_forward_merge.md b/doc/user/project/merge_requests/fast_forward_merge.md index 4f3c68090e4..2d59e535ce1 100644 --- a/doc/user/project/merge_requests/fast_forward_merge.md +++ b/doc/user/project/merge_requests/fast_forward_merge.md @@ -15,7 +15,7 @@ to accept merge requests without creating merge commits. When the fast-forward merge ([`--ff-only`](https://git-scm.com/docs/git-merge#git-merge---ff-only)) setting is enabled, no merge commits will be created and all merges are fast-forwarded, -which means that merging is only allowed if the branch could be fast-forwarded. +which means that merging is only allowed if the branch can be fast-forwarded. When a fast-forward merge is not possible, the user is given the option to rebase. @@ -28,9 +28,15 @@ When a fast-forward merge is not possible, the user is given the option to rebas Now, when you visit the merge request page, you will be able to accept it **only if a fast-forward merge is possible**. +![Fast forward merge request](img/ff_merge_mr.png) + +If a fast-forward merge is not possible but a conflict free rebase is possible, +a rebase button will be offered. + ![Fast forward merge request](img/ff_merge_rebase.png) -If the target branch is ahead of the source branch, you need to rebase the +If the target branch is ahead of the source branch and a conflict free rebase is +not possible, you need to rebase the source branch locally before you will be able to do a fast-forward merge. ![Fast forward merge rebase locally](img/ff_merge_rebase_locally.png) diff --git a/doc/user/project/merge_requests/img/ff_merge_mr.png b/doc/user/project/merge_requests/img/ff_merge_mr.png Binary files differnew file mode 100644 index 00000000000..241cc990343 --- /dev/null +++ b/doc/user/project/merge_requests/img/ff_merge_mr.png |