This page exists to communicate opportune time windows for merging to different repositories.
...
Groups of individuals with merge rights to one or more public repositories in the edx GitHub organization include:
members of the Core Contributor Program (Committers) (outside of edX),
employees of edX, and
contractors of edX.
...
| Note |
|---|
CCP Committers: Please consider these guidelines in conjunction with those listed in Committer reviews and ownership, as well as any understandings you’ve come to with your champions. As always, reach out to your champions or the |
...
When is edx/configuration deployed? | edx/configuration is continuously deployed to production. Upon merging a pull request, it is generally released to the Staging environment (http://courses.stage.edx.org ) within one hour and the Production environments (http://courses.edx.org and edge.edx.org) within two hours. |
|---|---|
What is the ideal merge window? | The best time to merge edx/configuration code is whenever you or your champion is prepared to respond issues related to the change, once it hits production ~2 hours later. For edX employees/contractors: this is generally M-F, within your team’s preferred working hours. (see below for more details) For CCP Committers: this is roughly the working hours of your champion(s). The edx/configuration Champions working hours are local to the UTC +05:00 timezone |
What should I do once I merge? | Committers should inform their champions about the merge. edX employees/contractors may post in the edX-Internal Slack |
...
Day of week | Dates | |||||
|---|---|---|---|---|---|---|
Weekends | Saturdays and Sunday | Christmas & New Year’s Day | (12/25 and 1/1). In previous years, we’ve also requested a broader merge freeze between 12/22 and 1/4. We may do this again. Reach out to your champion if you want to merge within this time period. | Sundays | ||
Holidays | ||||||
Friday | February 5 | |||||
Tuesday | March 23 | |||||
Saturday | May 1 | |||||
Friday, Saturday, Sunday | May 14, 15, 16 | |||||
Wednesday, Thursday, Friday | July 21, 22, 23 | |||||
Saturday | August 14 | |||||
Thursday, Friday | August 18, 19 | |||||
Monday | September 6 | |||||
Tuesday | October 19 | |||||
Thursday, Friday | November 25, 26 | Friday | December 24 | SaturdayDecember 25 | ||
Sunday | December 2 | Company Holiday Week | Monday Friday → FridaySunday | December 26th → December 3124th → January 2, 2022 Reach out to your champion if you want to merge within this time period. |
FAQ’s
What is the ideal merge window? | CCP Committers: You likely have already worked something out with your champions. Generally speaking, you can merge to these repositories whenever you want to (taking into consideration the table above), presuming that the PR meets all review requirements. |
|---|---|
What should I do once I merge? | CCP Committers should inform their champions. edX employees/contractors should inform the owning team. Depending on the repository, you may need to deploy. |
Are there other times merging is discouraged? | At the moment, no. |
...