Move Fast-Forward Merge and Semi-Linear Merge to CE
Fast-forward merge in CE:
-
Note that we are not bringing the rebase ability to CE.
-
Under the “Merge request settings” of a project, add the “Merge method” options: “Merge commit” and “Fast-forward merge”
- For the “Fast-forward merge” option, update the EE description so as not to provide a rebase option in the UI but rather a notice to rebase locally: “When fast-forward merge is not possible, the user is given the option to rebase must first rebase locally.”
- When fast-forward is used in the project, but is not possible to apply in the current the merge request, indicate so and just provide a message:
Semi-Linear Merge
- Also bring Semi-Linear Merge to CE
- Under the “Merge request settings” of a project, add the “Merge method” option: “Merge commit with semi-linear history ”
- Same message: “When fast-forward merge is not possible, the user is given the option to rebase must first rebase locally.”
Edited by Victor Wu