Page tree

Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

Info
titleHow to open a hotfix
git fetch --tags --force
git checkout -b <HOTFIX> <SOURCE>
git push origin <HOTFIX>
------------
<HOTFIX> - hotfix branch that will be created (hotfix/x.y.z)
<SOURCE> -	source branch for the hotfix (x.y)
Info
titleHow to close a hotfix
# get latest version of the release
git fetch
git checkout <HOTFIX>
git pull
# create version tag and push it to remote
git tag <VERSION>
git push origin <VERSION>
# update maintenance tag and push it to remote
git tag --force <MAINTENANCE>
git push --force origin <MAINTENANCE>
# if it is a hotfix to the latest release, 
# then merge into development branch
git checkout <TARGET>
git pull
git merge <HOTFIX>
git push origin <TARGET>
------------
<HOTFIX> - hotfix branch that will be closed
(hotfix/x.y.z)
<VERSION> - version of the hotfix, also included in
the hotfix branch name (x.y.z)
<MAINTENANCE> - partial version of the hotfix (x.y)
<TARGET> - target branch for the release (develop,
lts/x, lts/x.y)