Skip to content

Instantly share code, notes, and snippets.

@clok

clok/branching.md

Last active August 29, 2015 14:19
Show Gist options
  • Save clok/4e7c6bcecebbb19c6d9d to your computer and use it in GitHub Desktop.
Save clok/4e7c6bcecebbb19c6d9d to your computer and use it in GitHub Desktop.
Download ZIP
Development to production branching notes
Raw
branching.md

General Workflow

  • the develop branch is where ALL development starts from and merges to.
  • the master branch ALWAYS matches production
  • typical workflow would be branch a feature branch from develop, code and commit often. When code is readt for review & merge, open a Pull Request from the branch to develop.
  • a typical deploy to production will take the develop branch and merge to master. The master branch will then be deployed to production machines.
  • a hotfix is defined as a mission critical change that must be deployed to production with expediency.
    • the proper way to handle a hotfix is to branch from master and open a Pull Request from the branch to master

Great Reference

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment