Update fast-forward mr widget docs and add images

2017-09-19 00:04:19 -05:00 · 2017-09-19 00:04:19 -05:00 · 8e7b881556
parent f7f9847b26
commit 8e7b881556
3 changed files with 2 additions and 2 deletions
--- 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
--- a/doc/user/project/merge_requests/img/ff_merge_mr.png
+++ b/doc/user/project/merge_requests/img/ff_merge_mr.png
--- a/doc/user/project/merge_requests/img/ff_merge_rebase_locally.png
+++ b/doc/user/project/merge_requests/img/ff_merge_rebase_locally.png