Merge branch 'docs/update-automatic-merge-documentation' into 'master'

Update automatic merging documentation See merge request gitlab-org/gitlab-ce!23689

Merge branch 'docs/update-automatic-merge-documentation' into 'master'
Update automatic merging documentation See merge request gitlab-org/gitlab-ce!23689
5ee900ee · Marcia Ramos · be449047 · 8d99636e · 5ee900ee
Commit 5ee900ee authored Dec 12, 2018 by Marcia Ramos
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