Logo

Docs

Fix

Fix Graphic

Fix branches are used for you’ve guessed it, fixes. After they are ready to be merged a MR needs to be created and merged. Merging will not automatically trigger new deployment. You will need to use release instead.

More on this is detailed below in the guide.

How?

  1. Create a new branch from master/main using the naming convention fix/UR-1333 or fix/user-login
  2. Work on the feature and prefferably use MR to merge it to the master/main or directly merge to said branch
  3. Create a new incremented tag once it has been merged eg 1.2.14
    1. Once the tag is created, it will most likely be automatically pushed to development ( base gitlab-ci configuration )
  4. If needed use the CI pipelines to release to staging or production

TagFlower

  1. Create a new branch from master using tagflower and naming convention. eg. tagflower fix UR-1333 or tagflower fix user-login to create a new branch
  2. Work on the feature and use MR to merge it to the master or other branch

By hand using git tools

  1. Create a new branch from master using the naming convention eg. git checkout -B fix/UR-1333 or git checkout -B fix/user-login
  2. Work on the feature and use MR to merge it to the master or other branch

If you want to release changes to the environemnts, eg. development, after the MR is merged, follow release docs.