diff options
author | Robert Speicher <robert@gitlab.com> | 2017-02-17 18:39:34 +0300 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-02-17 18:39:34 +0300 |
commit | 953c2547a26992a89e7c540b80db3759f31a8e28 (patch) | |
tree | 9138baf3f1df189fb428f670e2299fcb52ac9dbf /doc | |
parent | 761c0c86d1dbcbbed450db54ef9083e75a41ed4d (diff) | |
parent | c6ab1e9d36e3791f5938078cb52f2b67ec4f977d (diff) |
Merge branch 'document-ce-to-ee' into 'master'
Document better the CE -> EE merge
See merge request !9313
Diffstat (limited to 'doc')
-rw-r--r-- | doc/development/limit_ee_conflicts.md | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/doc/development/limit_ee_conflicts.md b/doc/development/limit_ee_conflicts.md index 568dedf1669..2d82b09f301 100644 --- a/doc/development/limit_ee_conflicts.md +++ b/doc/development/limit_ee_conflicts.md @@ -2,19 +2,26 @@ This guide contains best-practices for avoiding conflicts between CE and EE. -## Context +## Daily CE Upstream merge -Usually, GitLab Community Edition is merged into the Enterprise Edition once a -week. During these merges, it's very common to get conflicts when some changes -in CE do not apply cleanly to EE. +GitLab Community Edition is merged daily into the Enterprise Edition (look for +the [`CE Upstream` merge requests]). The daily merge is currently done manually +by four individuals. -There are a few things that can help you as a developer to: +**If a developer pings you in a `CE Upstream` merge request for help with +resolving conflicts, please help them because it means that you didn't do your +job to reduce the conflicts nor to ease their resolution in the first place!** -- know when your merge request to CE will conflict when merged to EE -- avoid such conflicts in the first place -- ease future conflict resolutions if conflict is inevitable +To avoid the conflicts beforehand when working on CE, there are a few tools and +techniques that can help you: -## Check the `rake ee_compat_check` in your merge requests +- know what are the usual types of conflicts and how to prevent them +- the CI `rake ee_compat_check` job tells you if you need to open an EE-version + of your CE merge request + +[`CE Upstream` merge requests]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests?label_name%5B%5D=CE+upstream + +## Check the status of the CI `rake ee_compat_check` job For each commit (except on `master`), the `rake ee_compat_check` CI job tries to detect if the current branch's changes will conflict during the CE->EE merge. |