Special Case Rules

When we are working on a big feature and wants to ensure that the progress is not disturbed by other small features in progress, create new branch from production called features

• Make the features branch stay up to date with production

• Work in progress: Do the same thing just like in Branch Workflow

• Separate the progress of big feature: Additional step after Branch Workflow . Cherry pick the progress to the features branch

• Release preparation:

  • Checkout to the release branch

  • Instead of cherry-pick, rebase features branch to release

  • Push the release branch

  • Update the version using tagging rules

  • On the release date, rebase release branch to production and then push the production branch