Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
8e7b8815
Commit
8e7b8815
authored
Sep 19, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update fast-forward mr widget docs and add images
parent
f7f9847b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
2 deletions
+2
-2
doc/user/project/merge_requests/fast_forward_merge.md
doc/user/project/merge_requests/fast_forward_merge.md
+2
-2
doc/user/project/merge_requests/img/ff_merge_mr.png
doc/user/project/merge_requests/img/ff_merge_mr.png
+0
-0
doc/user/project/merge_requests/img/ff_merge_rebase_locally.png
...er/project/merge_requests/img/ff_merge_rebase_locally.png
+0
-0
No files found.
doc/user/project/merge_requests/fast_forward_merge.md
View file @
8e7b8815
...
...
@@ -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
doc/user/project/merge_requests/img/ff_merge_mr.png
0 → 100644
View file @
8e7b8815
20.9 KB
doc/user/project/merge_requests/img/ff_merge_rebase_locally.png
0 → 100644
View file @
8e7b8815
20.5 KB
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment