Below is the Gitflow workflow followed, where
master branch has the commit history(
git tag) of different releases.
From release mgmt aspect, we are deleting the
release branch after merging with
To apply hot fix, we first
git checkout a specific release commit from
master branch and then create a hotfix branch from that specific commit(shown in orange, below) and make changes.
git merge allow hotfix branch to get merged to intermediate commit node(as shown below) on
master branch? instead of merging to tip of
master, because hotfix is for