From d3b4f65da9db7ea2ac52d2ad58de1c3c3ded8747 Mon Sep 17 00:00:00 2001 From: Marc Radulescu Date: Thu, 12 Mar 2015 16:32:26 -0700 Subject: [PATCH 1/2] separate documentation for rebase before merge --- doc/workflow/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/workflow/README.md b/doc/workflow/README.md index a7216b3a00..948567b79f 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -3,6 +3,7 @@ - [Feature branch workflow](workflow.md) - [Project Features](project_features.md) - [Authorization for merge requests](authorization_for_merge_requests.md) +- [Rebase before merge](rebase_before_merge.md) - [Groups](groups.md) - [Share projects with other groups](share_projects_with_other_groups.md) - [Labels](labels.md) From c30629e15f959506a8b3e7e832819358e03f62ef Mon Sep 17 00:00:00 2001 From: Marc Radulescu Date: Thu, 12 Mar 2015 16:58:11 -0700 Subject: [PATCH 2/2] add documentation file --- doc/workflow/rebase_before_merge.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/workflow/rebase_before_merge.md diff --git a/doc/workflow/rebase_before_merge.md b/doc/workflow/rebase_before_merge.md new file mode 100644 index 0000000000..14461e2cc2 --- /dev/null +++ b/doc/workflow/rebase_before_merge.md @@ -0,0 +1,11 @@ +#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