Commit c356fae5 authored by Douwe Maan's avatar Douwe Maan

"will be" -> "is"

parent bdad266c
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
%strong Merge commit %strong Merge commit
%br %br
%span.descr %span.descr
A merge commit will be created for every merge, and merging is allowed as long as there are no conflicts. A merge commit is created for every merge, and merging is allowed as long as there are no conflicts.
.radio .radio
= label_tag :project_merge_method_rebase_merge do = label_tag :project_merge_method_rebase_merge do
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
%strong Merge commit with semi-linear history %strong Merge commit with semi-linear history
%br %br
%span.descr %span.descr
A merge commit will be created for every merge, but merging is only allowed if the branch has been rebased. A merge commit is created for every merge, but merging is only allowed if the branch has been rebased.
This way you get a history that reads linearly (as with fast-forward merges), with the addition of merge commits. This way you get a history that reads linearly (as with fast-forward merges), with the addition of merge commits.
%br %br
%span.descr %span.descr
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment