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
a5aafc7a
Commit
a5aafc7a
authored
Nov 09, 2021
by
Harsh Chouraria
Committed by
Amy Qualls
Nov 09, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add note about rebasing preventing approvals
parent
3585ac36
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
0 deletions
+7
-0
doc/topics/git/git_rebase.md
doc/topics/git/git_rebase.md
+5
-0
doc/user/project/merge_requests/fast_forward_merge.md
doc/user/project/merge_requests/fast_forward_merge.md
+2
-0
No files found.
doc/topics/git/git_rebase.md
View file @
a5aafc7a
...
@@ -145,6 +145,11 @@ To rebase from the UI:
...
@@ -145,6 +145,11 @@ To rebase from the UI:
GitLab schedules a rebase of the feature branch against the default branch and
GitLab schedules a rebase of the feature branch against the default branch and
executes it as soon as possible.
executes it as soon as possible.
The user performing the rebase action is considered
a user that added commits to the merge request. When the merge request approvals setting
[
**Prevent approvals by users who add commits**
](
../../user/project/merge_requests/approvals/settings.md#prevent-approvals-by-users-who-add-commits
)
is enabled, this setting prevents the user from also approving the merge request.
### Interactive rebase
### Interactive rebase
You can use interactive rebase to modify commits. For example, amend a commit
You can use interactive rebase to modify commits. For example, amend a commit
...
...
doc/user/project/merge_requests/fast_forward_merge.md
View file @
a5aafc7a
...
@@ -38,6 +38,8 @@ Now, when you visit the merge request page, you can accept it
...
@@ -38,6 +38,8 @@ Now, when you visit the merge request page, you can accept it
If a fast-forward merge is not possible but a conflict free rebase is possible,
If a fast-forward merge is not possible but a conflict free rebase is possible,
a rebase button is offered.
a rebase button is offered.
The rebase action is also available as a
[
quick action command: `/rebase`
](
../../../topics/git/git_rebase.md#rebase-from-the-gitlab-ui
)
.
![
Fast forward merge request
](
img/ff_merge_rebase.png
)
![
Fast forward merge request
](
img/ff_merge_rebase.png
)
If the target branch is ahead of the source branch and a conflict free rebase is
If the target branch is ahead of the source branch and a conflict free rebase is
...
...
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