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
cc5f5197
Commit
cc5f5197
authored
Aug 21, 2019
by
Ben Bodenmiller
Committed by
Achilleas Pipinellis
Aug 21, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve details about when rebase button is offered
parent
da573ae2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
doc/user/project/merge_requests/fast_forward_merge.md
doc/user/project/merge_requests/fast_forward_merge.md
+8
-2
doc/user/project/merge_requests/img/ff_merge_mr.png
doc/user/project/merge_requests/img/ff_merge_mr.png
+0
-0
No files found.
doc/user/project/merge_requests/fast_forward_merge.md
View file @
cc5f5197
...
...
@@ -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 c
ould
be fast-forwarded.
which means that merging is only allowed if the branch c
an
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
)
...
...
doc/user/project/merge_requests/img/ff_merge_mr.png
0 → 100644
View file @
cc5f5197
20.9 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