Skip to end of metadata
Go to start of metadata

You are viewing an old version of this page. View the current version.

Compare with Current View Page History

« Previous Version 2 Next »

For each project, we are using a two branch strategy for active development.

  1. master:  The master branch represents the stable version of the repository.  Documentation should be current with the master branch codebase.  Consumers of the platform should use either the master branch or the published artifacts.  
  2. develop: Each repository has a "develop" branch.  Active work is done on the develop branch.  CI builds reference the develop branch.  Work should not be merged from develop to master unless it is ready for release and the documentation will soon be updated (for example, at the end of an iteration).
    1. bug fixes: We don't have a strategy in place yet for bug fixes and patches.  At this point in time, bug fixes should be done on the develop branch. 

Initial setup of develop branch

 

Merge from develop to master

git checkout master
git merge develop -m "Merged from develop"
git push -u origin master
git checkout develop
  • No labels