Skip to content

Instantly share code, notes, and snippets.

@rianrainey

rianrainey/git-workflow.md

Created June 6, 2014 20:41
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save rianrainey/596643e4906e94abc869 to your computer and use it in GitHub Desktop.
Save rianrainey/596643e4906e94abc869 to your computer and use it in GitHub Desktop.
Download ZIP
Github Workflow
Raw
git-workflow.md
  1. All new branches are created off of the tip of master.
  2. All commits should be created in a feature, bug, or hotfix branch prefixed by "feature/", "bug/", "hotfix/", respectively.
  3. Commits only find their way into master via the GitHub pull request.
  4. All bug/ branches should start with the Redmine issue number if documented in a Redmine issue.
  5. All branch names should use hyphens, NOT underscores.
  6. The integration branch for a staging site shall be called "staging".
  7. Feature branches should be manually merged into staging, often, and staging should be deployable by any member of the project team to facilitate a rapid client feedback cycle.
  8. Only the project lead should merge pull requests into master and deploy to production, unless that person is unavailable.
  9. There should be an alternate project lead.
  10. Do not generate a pull request until you have client approval for the feature.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment