diff options
| author | John T Skarbek <jskarbek@gitlab.com> | 2019-06-28 08:39:10 -0400 |
|---|---|---|
| committer | John T Skarbek <jskarbek@gitlab.com> | 2019-07-01 07:33:20 -0400 |
| commit | dc3f352218a756d9f3404732a9b1f6f669d0ea0c (patch) | |
| tree | 7f8316133072aa736598f08c0ce278ffe432ee8a | |
| parent | 1dbdd3d4330c02de6546e57545d83fa3ce9d6ef1 (diff) | |
| download | gitlab-ce-jts/backport-doc-update.tar.gz | |
Expound backporting a tad bitjts/backport-doc-update
This bolsters the information in this document, based on questions
recently raised in issue: https://gitlab.com/gitlab-org/release/framework/issues/378
| -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 6b416cf588c..609000c8217 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. |