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
c30629e1
Commit
c30629e1
authored
Mar 12, 2015
by
Marc Radulescu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add documentation file
parent
d3b4f65d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
0 deletions
+11
-0
doc/workflow/rebase_before_merge.md
doc/workflow/rebase_before_merge.md
+11
-0
No files found.
doc/workflow/rebase_before_merge.md
0 → 100644
View file @
c30629e1
#Rebase before merge
GitLab Enterprise Edition offers a way to rebase before merging a merge request. You can configure this per project basis by navigating to the project settings page and selecting
`Merge Requests Rebase`
checkbox.
![
Merge request settings
](
merge_request_settings.png
)
Before accepting a merge request, select
`rebase before merge`
.
![
Merge request widget
](
merge_request_widget.png
)
GitLab will attempt to cleanly rebase before merging branches. If clean rebase is not possible, regular merge will be performed.
If clean rebase is possible and history of the traget branch will be altered with the the merge.
\ No newline at end of file
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