Start

Check what repos have been changed. This changes what steps need to be done

Check: Minor or Patch Release?

Wrong format, please enter as: 1.2.3
Patch Release Minor Release

Resulting Version

TDR Alerts App

  1. Click the button below
  2. Check if the 'Commits' tab has any changes
  3. Do not create the merge request (close the tab again)

UI Apps

  1. Click the button below
  2. Check if the 'Commits' tab has any changes
  3. Do not create the merge request (close the tab again)

SA-SCS-TDR-Alerts

Alerts App

Merge release ➡ production

  1. TODO describe all the steps needed to merge something!
  2. Step 2

Create tag

  1. TODO describe all the steps needed to create the tag
  2. Step 2

General Tips

Merge conflicts

If you have a merge conflict, the general idea is to do a back-merge.

Make sure you understand what you're doing! This is ONLY APPLICABLE if the two branches should be the same.

Do NOT use this when merging release ➡ develop . You will create a mess ( develop ➡ release )

Example: you want to merge release ➡ production , but you face a merge conflict

A solution that sometimes works is to do a back-merge: in this example, merge production ➡ release .

There are no links provided for this operation, you can do it on your local machine