Comprehensive Code Flow Management

Page

Philosophy

We are following the gitflow method where Master is stable and production ready. We did not start out this way but are migrating quickly to adopting this method with some alterations.

Maintenance flow [1].

Luggage code flow

Current Branches 

  1. master - https://github.com/isubit/luggage/tree/master
    A production quality, version release only branch. We are following the gitflow method. Travis-CI
     
  2. - https://github.com/isubit/luggage/tree/hotfix
    A luggage feature specific hotfix branch. Namely not Drupal, that is done in the drupal branch.
     
  3. release - https://github.com/isubit/luggage/tree/release
    A branch for testing potential releases. Travis-CI runs against this branch
     
  4. development - https://github.com/isubit/luggage/tree/development
    The active growing Head where all feature branches are merged in. This is the branch we are testing with Travis-CI.
     
  5. 1.0.0 - https://github.com/isubit/luggage/tree/1.0.0
    A deprecated branch from the active development branch that marks a major version release and is no longer being maintained except for security hot fixes. We prefer to upgrade everything to the current Development branch.
     
  6. unique - https://github.com/isubit/luggage/tree/unique
    A branch that contains files that are unique to this repo. This branch makes it easier to allow some file name space to remain open to facilitate code flow down stream to other forks like luggage_isu. ie,. README.md and .travis.ci

Luggage_isu code flow

Current Branches 

  1. master - https://github.com/isubit/luggage_isu/tree/master
    A production quality, version release only branch. We are following the gitflow method. Travis-CI
     
  2. - https://github.com/isubit/luggage_isu/tree/hotfix
    luggage feature specific hotfix branch. Namely not Drupal, that is done in the drupal branch.
     
  3. releasehttps://github.com/isubit/luggage_isu/tree/release
    A branch for testing potential releases. Travis-CI runs against this branch
     
  4. development - https://github.com/isubit/luggage_isu/tree/development
    The active growing Head where all feature branches are merged in. This is the branch we are testing with Travis-CI. This is the only branch that is `pulled` from Luggage.
     
  5. 1.0.0 - https://github.com/isubit/luggage_isu/tree/1.0.0
    A deprecated branch from the active development branch that marks a major version release and is no longer being maintained except for security hot fixes. We prefer to upgrade everything to the current Development branch.
     
  6. unique - https://github.com/isubit/luggage_isu/tree/unique
    A branch that contains files that are unique to this repo. This branch makes it easier to allow some file name space to remain open to facilitate code flow down stream to other forks like luggage_isu_YOURFORK. ie,. README.md and .travis.ci

Recommended code flow for your downstream fork of Luggage or Luggage_isu 

Branches 

  1.  - https://github.com/isubit/luggage_isu/tree/master
    A production quality, version release only branch. We are following the gitflow method. Travis-CI
     
  2. - https://github.com/isubit/luggage/tree/hotfix
    luggage feature specific hotfix branch. Namely not Drupal, that is done in the drupal branch.
     
  3.  - https://github.com/isubit/luggage_isu/tree/release
    A branch for testing potential releases. Travis-CI runs against this branch
     
  4.  - https://github.com/isubit/luggage/tree/development
    The active growing Head where all feature branches are merged in. This is the branch we are testing with Travis-CI. This is the only branch that is `pulled` from Luggage.
     
  5. unique - https://github.com/isubit/luggage/tree/unique
    A branch that contains files that are unique to this repo. This branch makes it easier to allow some file name space to remain open to facilitate code flow down stream to other forks like luggage_isu_YOURFORK. ie,. README.md and .travis.ci

References:

  1. Gitflow (Atlassian) - https://www.atlassian.com/git/workflows#!workflow-gitflow
Category: