Skip to content

Update automatic merging documentation

Yorick Peterse requested to merge docs/update-automatic-merge-documentation into master

What does this MR do?

We're moving from merging + reverting to only merging with the ours strategy, removing the need for merge requests or reverting conflicts. For more details, refer to Merge Train merge request merge-train!6 (merged).

Related merge requests

merge-train!6 (merged)

Author's checklist

Review checklist

  • Your team's review (required)
  • Technical writer's review (required)
  • Merge the EE-MR first, CE-MR afterwards
Edited by Marcia Ramos

Merge request reports