diff options
| author | John Skarbek <jskarbek@gitlab.com> | 2019-07-03 08:17:42 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2019-07-03 08:17:42 +0000 |
| commit | ac14fd3d84b1fb12612dc7c8c2324c2bd1ec571c (patch) | |
| tree | ad004d01fce8b8ca5da9de945fb2ebb85b60dbaa /doc | |
| parent | db639e090cee596dd08791938d59ccec5f168fb9 (diff) | |
| download | gitlab-ce-ac14fd3d84b1fb12612dc7c8c2324c2bd1ec571c.tar.gz | |
Expound backporting a tad bit
This bolsters the information in this document, based on questions
recently raised in issue: https://gitlab.com/gitlab-org/release/framework/issues/378
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/development/ee_features.md | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/doc/development/ee_features.md b/doc/development/ee_features.md index 34d41cf4958..6f4a36d4066 100644 --- a/doc/development/ee_features.md +++ b/doc/development/ee_features.md @@ -1036,7 +1036,14 @@ to avoid conflicts during CE to EE merge. ### Backporting changes from EE to CE -When working in EE-specific features, you might have to tweak a few files that are not EE-specific. Here is a workflow to make sure those changes end up backported safely into CE too. +Until the work completed to merge the ce and ee codebases, which is tracked on [epic &802](https://gitlab.com/groups/gitlab-org/-/epics/802), there exists times in which some changes for EE require specific changes to the CE +code base. Examples of backports include the following: + +* Features intended or originally built for EE that are later decided to move to CE +* Sometimes some code in CE may impact the EE feature + +Here is a workflow to make sure those changes end up backported safely into CE too. + (This approach does not refer to changes introduced via [csslab](https://gitlab.com/gitlab-org/csslab/).) 1. **Make your changes in the EE branch.** If possible, keep a separated commit (to be squashed) to help backporting and review. |