diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-11-26 09:24:16 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-11-26 09:24:16 +0000 |
| commit | 00cbe6c9fdd942041fac22337b14d77723697733 (patch) | |
| tree | 03579881f057be659404c6969f616bb1504a376b /doc | |
| parent | ac12301445e2a22405c68de8088bda9923bcc1f0 (diff) | |
| parent | 9177beead7679afd55bb00f75897aa1fc391cc2c (diff) | |
| download | gitlab-ce-00cbe6c9fdd942041fac22337b14d77723697733.tar.gz | |
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
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 |