Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
115c4cee
Commit
115c4cee
authored
Aug 15, 2019
by
Ash McKenzie
Committed by
Evan Read
Aug 15, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add section on how we run CE->EE merge at GitLab
parent
b9f71bb1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
0 deletions
+13
-0
doc/development/automatic_ce_ee_merge.md
doc/development/automatic_ce_ee_merge.md
+13
-0
No files found.
doc/development/automatic_ce_ee_merge.md
View file @
115c4cee
...
@@ -171,6 +171,19 @@ Now, every time you create an MR for CE and EE:
...
@@ -171,6 +171,19 @@ Now, every time you create an MR for CE and EE:
job failed, you are required to submit the EE MR so that you can fix the conflicts in EE
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.
before merging your changes into CE.
## How we run the Automatic CE->EE merge at GitLab
At GitLab, we use the
[
Merge Train
](
https://gitlab.com/gitlab-org/merge-train
)
project to keep our
[
gitlab-ee
](
https://gitlab.com/gitlab-org/gitlab-ee
)
repository updated with commits from
[
gitlab-ce
](
https://gitlab.com/gitlab-org/gitlab-ce
)
.
We have a mirror of the
[
Merge Train
](
https://gitlab.com/gitlab-org/merge-train
)
project
[
configured
](
https://ops.gitlab.net/gitlab-org/merge-train
)
to run an
automatic CE->EE merge job every twenty minutes as a scheduled CI job. The
[
configured
](
https://ops.gitlab.net/gitlab-org/merge-train
)
Merge Train project
is only accessible to authorized GitLab staff.
## FAQ
## FAQ
### How does automatic merging work?
### How does automatic merging work?
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment