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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
6b79ed9d
Commit
6b79ed9d
authored
Oct 07, 2017
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CE->EE: Fix conflict in doc/user/project/merge_requests/fast_forward_merge.md
parent
bb054ae5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
8 deletions
+0
-8
doc/user/project/merge_requests/fast_forward_merge.md
doc/user/project/merge_requests/fast_forward_merge.md
+0
-8
No files found.
doc/user/project/merge_requests/fast_forward_merge.md
View file @
6b79ed9d
...
...
@@ -28,16 +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
<<<<<<< HEAD
source branch before you will be able to do a fast-forward merge.
![
Fast forward merge rebase
](
img/ff_merge_rebase.png
)
[
products
]:
https://about.gitlab.com/products/
"GitLab products page"
=======
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
)
>>>>>>> ce/master
[
ffonly
]:
https://git-scm.com/docs/git-merge#git-merge---ff-only
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