Commit 9130e37c authored by Victor Wu's avatar Victor Wu Committed by Sean McGivern

ff-rebase-docs

parent 629b5303
...@@ -9,7 +9,7 @@ When the fast-forward merge ([`--ff-only`][ffonly]) setting is enabled, no merge ...@@ -9,7 +9,7 @@ When the fast-forward merge ([`--ff-only`][ffonly]) setting is enabled, no merge
commits will be created and all merges are fast-forwarded, which means that commits will be created and all merges are fast-forwarded, which means that
merging is only allowed if the branch could be fast-forwarded. merging is only allowed if the branch could be fast-forwarded.
When a fast-forward merge is not possible, the user must rebase the branch manually. When a fast-forward merge is not possible, the user is given the option to rebase.
## Use cases ## Use cases
...@@ -25,7 +25,7 @@ merge commits. In such cases, the fast-forward merge is the perfect candidate. ...@@ -25,7 +25,7 @@ merge commits. In such cases, the fast-forward merge is the perfect candidate.
Now, when you visit the merge request page, you will be able to accept it Now, when you visit the merge request page, you will be able to accept it
**only if a fast-forward merge is possible**. **only if a fast-forward merge is possible**.
![Fast forward merge request](img/ff_merge_mr.png) ![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, you need to rebase the
source branch locally 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.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment