-
Notifications
You must be signed in to change notification settings - Fork 345
November 26, 2018 Meeting
Matt King edited this page Nov 26, 2018
·
4 revisions
Here's an overview of our latest branch management strategy.
As long as we are publishing two versions of APG, one for ARIA 1.2 and one for ARIA 1.1, we will use the following branch management strategy. Down the road, we may want to take a different approach to ARIA.next content. The two versions is primarily because the APG is in catch-up mode ... we are actively developing new content for both versions of ARIA. When there is little or no new content being developed for the current version of ARIA, things get simpler.
- 4 protected branches: gh-pages, master, apg-1.1, apg-1.2
- master is "forever" content; gets merged to both 1.1 and 1.2.
- Commits merged to master from feature branches are ALWAYS squashed with commit written in descriptive format designed for change history.
- We NEVER cherry-pick into apg-1.1 or apg-1.2 from master -- only merge.
- By avoiding cherry-pick, we can compare branches accurately and create accurate change logs.
- Triage 5 newest issues
- Triaged issues have:
- One of the labels that indicates type of issue: bug, enhancement, editorial, documentation, maintenance
- One of the labels that indicates part of APG: code example, pattern, guidance
- A milestone indicating target resolution date
- If related to a pattern or code example, it is assigned to a project.
- Unlabeled issues
- No meetings on December 24 and December 31
- Home
- About the APG TF Work
- Contributing
- Meetings
- Management and Operations Documentation
- Publication Change Logs