A repository for teaching the concepts of DevOps - Software Management Course
| Branch Name | Naming Convention | Description, Instructions, Notes | Branch off from | Merge Back Into | |
|---|---|---|---|---|---|
| Release | release-* | Accepts merges from Working and Hotfixes | |||
| master | master | Accepts merges from Features/Issues and Hotfixes | |||
| Features/Issues | topic-* | Always branch off HEAD of Working | |||
| Hotfix | hotfix-* | Always branch off Stable |
$ git checkout release // change to the release branch
$ git merge --no-ff hotfix-id // forces creation of commit object during merge
$ git tag -a <tag> // tags the fix
$ git push origin stable --tags // push tag changes
