Scenario:

  • To fix a bug on production code.
  • However, new features in ‘working’ branch can’t be merged into production until release date.

Statuses of repositories:

git-merge-hotfix

Code merging flow:

git-merge-hotfix2.png

Advertisements