From 8e7b88155658165baf70981033a9737ee0ad09f2 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Tue, 19 Sep 2017 00:04:19 -0500 Subject: Update fast-forward mr widget docs and add images --- doc/user/project/merge_requests/fast_forward_merge.md | 4 ++-- doc/user/project/merge_requests/img/ff_merge_mr.png | Bin 0 -> 21380 bytes .../merge_requests/img/ff_merge_rebase_locally.png | Bin 0 -> 21013 bytes 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 doc/user/project/merge_requests/img/ff_merge_mr.png create mode 100644 doc/user/project/merge_requests/img/ff_merge_rebase_locally.png diff --git a/doc/user/project/merge_requests/fast_forward_merge.md b/doc/user/project/merge_requests/fast_forward_merge.md index 610a01a205f..085170d9f03 100644 --- a/doc/user/project/merge_requests/fast_forward_merge.md +++ b/doc/user/project/merge_requests/fast_forward_merge.md @@ -28,8 +28,8 @@ Now, when you visit the merge request page, you will be able to accept it ![Fast forward merge request](img/ff_merge_mr.png) If the target branch is ahead of the source branch, you need to rebase the -source branch before you will be able to do a fast-forward merge. +source branch locally before you will be able to do a fast-forward merge. -![Fast forward merge rebase](img/ff_merge_rebase.png) +![Fast forward merge rebase locally](img/ff_merge_rebase_locally.png) [ffonly]: https://git-scm.com/docs/git-merge#git-merge---ff-only diff --git a/doc/user/project/merge_requests/img/ff_merge_mr.png b/doc/user/project/merge_requests/img/ff_merge_mr.png new file mode 100644 index 00000000000..241cc990343 Binary files /dev/null and b/doc/user/project/merge_requests/img/ff_merge_mr.png differ diff --git a/doc/user/project/merge_requests/img/ff_merge_rebase_locally.png b/doc/user/project/merge_requests/img/ff_merge_rebase_locally.png new file mode 100644 index 00000000000..fb412296efc Binary files /dev/null and b/doc/user/project/merge_requests/img/ff_merge_rebase_locally.png differ -- cgit v1.2.1