Merging into master Branch

Updated 1,400 Days AgoPublic

Actions

About every two to four weeks we strive for a merge into the master branch, following the release approach of git-flow. The merges are tagged and accompanied by change logs. We follow a strict protocol for master merges:

1. Determine the name of the merge
   1. Look up the current week number (ISO-8601): https://www.epochconverter.com/weeknumbers
   2. Look up the weeks of the current month and choose the best fitting description:
      • Very Early <Month>
      • Early <Month>
      • Mid <Month>
      • Late <Month>
      • Very Late <Month>
   3. The naming scheme is <Year> Week <Week> (<Description>)
   4. For the rest of this protocol, we exemplarily use 2020 Week 39 (Late September)
2. For now, create an empty Phriction page for the change log
   1. The URI scheme is https://phabricator.mitk.org/w/mitk/changelog/2020.39/
   2. The title is 2020 Week 39 (Late September)
3. Create (and assign) an MITK task for the merge
   1. The title is 2020 Week 39 (Late September)
   2. The description is a link to the changelog in Remarkup format: [[mitk/changelog/2020.39]]
4. Create a release branch
   1. For all following git actions you must be a member of the MITK Elevated Branching Privileges group
   2. Look up CDash to identify the most recent green commit in the develop branch
   3. Create and checkout release branch: git checkout -b release/T<n>-2020-Week-39 <commit>
   4. Push release branch: git push -u origin release/T<n>-2020-Week-39
   5. The push will execute a git hook that writes a table into the task containing all merge commits, associated tasks and revisions (Phabricator Differentials) since the last master merge
5. Write the change log
   1. Use the generated table in the task mentioned above to write the change log in Phriction