Merge branch 'docs/ce-to-ee-no-squash' into 'master'

Instruct against squashing in CE to EE MRs

See merge request gitlab-org/gitlab-ce!23330

doc/development/automatic_ce_ee_merge.md

@@ -17,6 +17,9 @@ This merge is done automatically in a
 1. If all conflicts are resolved after your resolution is pushed, keep the merge
    request assigned to you: **you are now responsible for the merge request to be
    green**
+1. If you are the last person to resolve the conflicts, the pipeline is green,
+   and you have merge rights, merge the MR, but **do not** choose to squash.
+   Otherwise, assign the MR to someone that can merge.
 1. If you need any help, you can ping the current [release managers], or ask in
    the `#ce-to-ee` Slack channel