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: # Determine the name of the merge # Look up the current week number (ISO-8601): https://www.epochconverter.com/weeknumbers # 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>// # The naming scheme is `<Year> Week <Week> (<Description>)` # For the rest of this protocol, we exemplarily use `2020 Week 39 (Late September)` # For now, create an empty Phriction page for the change log # The URI scheme is `https://phabricator.mitk.org/w/mitk/changelog/2020.39/` # The title is `2020 Week 39 (Late September)` # Create an MITK task for the merge # The title is `2020 Week 39 (Late September)` # The description is a link to the changelog in Remarkup format: `[[mitk/changelog/2020.39]]`

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: # Determine the name of the merge # Look up the current week number (ISO-8601): https://www.epochconverter.com/weeknumbers # 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>// # The naming scheme is `<Year> Week <Week> (<Description>)` # For the rest of this protocol, we exemplarily use `2020 Week 39 (Late September)` # For now, create an empty Phriction page for the change log # The URI scheme is `https://phabricator.mitk.org/w/mitk/changelog/2020.39/` # The title is `2020 Week 39 (Late September)` # Create (and assign) an MITK task for the merge # The title is `2020 Week 39 (Late September)` # The description is a link to the changelog in Remarkup format: `[[mitk/changelog/2020.39]]` # Create a release branch # For all following git actions you must be a member of the #mitk_elevated_branching_privileges group # Look up [[https://cdash.mitk.org/index.php?project=MITK|CDash]] to identify the most recent green commit in the develop branch # Create and checkout release branch: `git checkout -b release/T<n>-2020-Week-39 <commit>` # Push release branch: `git push -u origin release/T<n>-2020-Week-39` # 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 # Write the change log # Use the generated table in the task mentioned above to write the change log in Phriction

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: # Determine the name of the merge # Look up the current week number (ISO-8601): https://www.epochconverter.com/weeknumbers # 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>// # The naming scheme is `<Year> Week <Week> (<Description>)` # For the rest of this protocol, we exemplarily use `2020 Week 39 (Late September)` # For now, create an empty Phriction page for the change log # The URI scheme is `https://phabricator.mitk.org/w/mitk/changelog/2020.39/` # The title is `2020 Week 39 (Late September)` # Create (and assign) an MITK task for the merge # The title is `2020 Week 39 (Late September)` # The description is a link to the changelog in Remarkup format: `[[mitk/changelog/2020.39]]` # Create a release branch # For all following git actions you must be a member of the #mitk_elevated_branching_privileges group # Look up [[https://cdash.mitk.org/index.php?project=MITK|CDash]] to identify the most recent green commit in the develop branch # Create and checkout release branch: `git checkout -b release/T<n>-2020-Week-39 <commit>` # Push release branch: `git push -u origin release/T<n>-2020-Week-39` # 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 # Write the change log # Use the generated table in the task mentioned above to write the change log in Phriction