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
5ed1793d
Commit
5ed1793d
authored
Feb 22, 2022
by
Kev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update image in FF-merge doc
parent
696f7462
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
1 deletion
+1
-1
doc/user/project/merge_requests/fast_forward_merge.md
doc/user/project/merge_requests/fast_forward_merge.md
+1
-1
doc/user/project/merge_requests/img/ff_merge_rebase_v14_7.png
...user/project/merge_requests/img/ff_merge_rebase_v14_7.png
+0
-0
doc/user/project/merge_requests/img/ff_merge_rebase_v14_9.png
...user/project/merge_requests/img/ff_merge_rebase_v14_9.png
+0
-0
No files found.
doc/user/project/merge_requests/fast_forward_merge.md
View file @
5ed1793d
...
...
@@ -43,7 +43,7 @@ You can also rebase without running a CI/CD pipeline.
The rebase action is also available as a
[
quick action command: `/rebase`
](
../../../topics/git/git_rebase.md#rebase-from-the-gitlab-ui
)
.


If the target branch is ahead of the source branch and a conflict free rebase is
not possible, you need to rebase the
...
...
doc/user/project/merge_requests/img/ff_merge_rebase_v14_7.png
deleted
100644 → 0
View file @
696f7462
13.5 KB
doc/user/project/merge_requests/img/ff_merge_rebase_v14_9.png
0 → 100644
View file @
5ed1793d
17.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