diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-11-23 17:00:38 +0100 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-11-23 17:00:38 +0100 |
| commit | 9177beead7679afd55bb00f75897aa1fc391cc2c (patch) | |
| tree | d5d3004ed317cb15299403d56555efe6bd26cdde /doc | |
| parent | a079bf7f9afc420cd08c2575642f820a19cd7da6 (diff) | |
| download | gitlab-ce-9177beead7679afd55bb00f75897aa1fc391cc2c.tar.gz | |
Instruct against squashing in CE to EE MRsdocs/ce-to-ee-no-squash
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/development/automatic_ce_ee_merge.md | 3 |
1 files changed, 3 insertions, 0 deletions
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 |