Merge branch 'jts/backport-doc-update' into 'master'
Expound backporting a tad bit See merge request gitlab-org/gitlab-ce!29918
This commit is contained in:
commit
903227b040
|
@ -1036,7 +1036,14 @@ to avoid conflicts during CE to EE merge.
|
||||||
|
|
||||||
### Backporting changes from EE to CE
|
### 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/).)
|
(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.
|
1. **Make your changes in the EE branch.** If possible, keep a separated commit (to be squashed) to help backporting and review.
|
||||||
|
|
Loading…
Reference in New Issue