IT:AD:GitFlow

Summary

  • Considerations:
    • Uses 4 branch groups: Master, Dev, Features-n, Releases-n
    • Master is for Releases
    • Dev is a Stage for Dev that contains all completed Branches
    • Features are branched from Dev and merged back into Dev
    • And then Dev is branched to a Release
    • WHich is merged with Master
  • Advantages:
    • Can handle hotfixes to previous releases that won't be infected with current Dev code.
    • Each Feature branch is a sandbox, kept separate from Dev until completed.