2018-03-17 18:26:18 +05:30
|
|
|
- form = local_assigns.fetch(:form)
|
|
|
|
|
- project = local_assigns.fetch(:project)
|
|
|
|
|
|
|
|
|
|
.radio
|
|
|
|
|
= label_tag :project_merge_method_ff do
|
2018-03-27 19:54:05 +05:30
|
|
|
= form.radio_button :merge_method, :ff, class: "js-merge-method-radio qa-radio-button-merge-ff"
|
2018-03-17 18:26:18 +05:30
|
|
|
%strong Fast-forward merge
|
|
|
|
|
%br
|
|
|
|
|
%span.descr
|
|
|
|
|
No merge commits are created and all merges are fast-forwarded, which means that merging is only allowed if the branch could be fast-forwarded.
|
|
|
|
|
%br
|
|
|
|
|
%span.descr
|
|
|
|
|
When fast-forward merge is not possible, the user is given the option to rebase.
|
