From 9177beead7679afd55bb00f75897aa1fc391cc2c Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Fri, 23 Nov 2018 17:00:38 +0100 Subject: Instruct against squashing in CE to EE MRs --- doc/development/automatic_ce_ee_merge.md | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc/development') diff --git a/doc/development/automatic_ce_ee_merge.md b/doc/development/automatic_ce_ee_merge.md index 9dd78806a12..58e08d432cc 100644 --- a/doc/development/automatic_ce_ee_merge.md +++ b/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 -- cgit v1.2.3