diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2018-12-13 17:14:48 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-12-13 17:14:48 +0000 |
| commit | 0bb17425943a3fba430ed3034cf854e274298abc (patch) | |
| tree | b00cd3e6d3c1ea7878b3cb1f45594c879d64919b | |
| parent | b5dbfbbac90d067c51f9d2bb80fa5b368ae21548 (diff) | |
| parent | 8028f2458d7e4b3f1fda8e5f6c4885079bca9009 (diff) | |
| download | gitlab-ce-0bb17425943a3fba430ed3034cf854e274298abc.tar.gz | |
Merge branch 'docs/fix-automatic-merge-documentation' into 'master'
Fix documentation for automatic merging
See merge request gitlab-org/gitlab-ce!23784
| -rw-r--r-- | doc/development/automatic_ce_ee_merge.md | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/doc/development/automatic_ce_ee_merge.md b/doc/development/automatic_ce_ee_merge.md index 8208e9007ea..0cc083cefc0 100644 --- a/doc/development/automatic_ce_ee_merge.md +++ b/doc/development/automatic_ce_ee_merge.md @@ -1,12 +1,13 @@ # Automatic CE->EE merge Commits pushed to CE `master` are automatically merged into EE `master` roughly -every 5 minutes. Changes are merged using the `ours` merge strategy in the -context of EE. This means that any merge conflicts are resolved by taking the EE -changes and discarding the CE changes. This removes the need for resolving -conflicts or reverting changes, at the cost of **absolutely requiring** EE merge -requests to be created whenever a CE merge request causes merge conflicts. -Failing to do so can result in changes not making their way into EE. +every 5 minutes. Changes are merged using the `recursive=ours` merge strategy in +the context of EE. This means that any merge conflicts are resolved by taking +the EE changes and discarding the CE changes. This removes the need for +resolving conflicts or reverting changes, at the cost of **absolutely +requiring** EE merge requests to be created whenever a CE merge request causes +merge conflicts. Failing to do so can result in changes not making their way +into EE. ## Always create an EE merge request if there are conflicts @@ -169,10 +170,6 @@ you are not required to submit the EE-equivalent MR, but it's still recommended. job failed, you are required to submit the EE MR so that you can fix the conflicts in EE before merging your changes into CE. ---- - -[Return to Development documentation](README.md) - ## FAQ ### How does automatic merging work? @@ -180,7 +177,8 @@ before merging your changes into CE. The automatic merging is performed using a project called [Merge Train](https://gitlab.com/gitlab-org/merge-train/). This project will clone CE and EE master, and merge CE master into EE master using `git merge ---strategy=ours`. This process runs roughly every 5 minutes. +--strategy=recursive --strategy-option=ours`. This process runs multiple times +per hour. For more information on the exact implementation you can refer to the source code. @@ -225,3 +223,7 @@ so that the EE specific changes are not intertwined with CE code. For Ruby code you can do this by moving the EE code to a separate module, which can then be injected into the appropriate classes or modules. See [Guidelines for implementing Enterprise Edition features](ee_features.md) for more information. + +--- + +[Return to Development documentation](README.md) |