Update automatic merging documentation

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 https://gitlab.com/gitlab-org/merge-train/merge_requests/6.

Update automatic merging documentation
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 https://gitlab.com/gitlab-org/merge-train/merge_requests/6.
8d99636e · Yorick Peterse · 955b4b92 · 8d99636e
Commit 8d99636e authored Dec 10, 2018 by Yorick Peterse
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 177 additions and 83 deletions

doc/development/automatic_ce_ee_merge.md doc/development/automatic_ce_ee_merge.md +177 -83

No files found.
--- a/doc/development/automatic_ce_ee_merge.md
+++ b/doc/development/automatic_ce_ee_merge.md