Skip to content

Use recursive=ours instead of "ours" for merging

Yorick Peterse requested to merge recursive-ours into master

The "ours" merge strategy simply discards all changes except from our changes, whereas recursive=ours will resolve conflicts using our changes but take the other ones for non conflicting lines. This would lead to GitLab EE not having changes made in CE, all because of incredibly confusingly named options.

Merge request reports