diff options
| author | Ville Skyttä <ville.skytta@iki.fi> | 2018-01-19 12:09:59 +0200 |
|---|---|---|
| committer | Ville Skyttä <ville.skytta@iki.fi> | 2018-01-19 12:09:59 +0200 |
| commit | 0cbbb08e790260ad936810e0047e03938c001e9b (patch) | |
| tree | 659eba953a3b578d99c7910a6b4f6c7c951ec53b /doc/development/automatic_ce_ee_merge.md | |
| parent | 6aed49bfcaa1ff11c335c2bfb52a1a93c730a07c (diff) | |
| download | gitlab-ce-0cbbb08e790260ad936810e0047e03938c001e9b.tar.gz | |
doc: Spelling fixes
Diffstat (limited to 'doc/development/automatic_ce_ee_merge.md')
| -rw-r--r-- | doc/development/automatic_ce_ee_merge.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/automatic_ce_ee_merge.md b/doc/development/automatic_ce_ee_merge.md index 4b9791c95bc..5a784b6de06 100644 --- a/doc/development/automatic_ce_ee_merge.md +++ b/doc/development/automatic_ce_ee_merge.md @@ -61,7 +61,7 @@ against EE. 1. Tries to apply it to current EE `master` 1. If it applies cleanly, the job succeeds -In the case where the job fails, it means you should create a `ee-<ce_branch>` +In the case where the job fails, it means you should create an `ee-<ce_branch>` or `<ce_branch>-ee` branch, push it to EE and open a merge request against EE `master`. At this point if you retry the failing job in your CE merge request, it should |