Skip to content

Instantly share code, notes, and snippets.

@joaodaher
Last active March 14, 2017 17:22
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 joaodaher/edf7a166cc8738f853b85ccd191a4a39 to your computer and use it in GitHub Desktop.
Save joaodaher/edf7a166cc8738f853b85ccd191a4a39 to your computer and use it in GitHub Desktop.

Fluxo de desenvolvimento

Branches

Master

Cada commit nessa branch deve ser considerado pronto para deploy em produção (ContinuousIntegration-ready)

  • Branch off: -
  • Merge to: hotfix/

Develop

Branch de integração das features desenvolvidas e erros corrigidos. Recebe apenas merge/branch, nunca commits diretos.

  • Branch off: master
  • Merge to: release/

Feature

Cada nova feature (funcionalidade, melhoria, etc) deve ter sua própria branch, com o prefixo feature/ (ex: feature/my-feature)

  • Branch off: develop/
  • Merge to: develop/

Hotfix

Correções rápidas durante o processo de deploy. Deve ter sua própria branch, com o prefixo hotfix/ (ex: hotfix/fabfile-error)

  • Branch off: master (iniciar quickfix)
  • Merge to: master (quickfix de produção), develop (persistir quickfix)

Release

Últimos ajustes para fazer o deploy (ajuste de versão, changelog, etc.). Deve ter sua própria branch, com o prefixo release/ (ex: release/2017-07-19)

  • Branch off: develop (iniciar release)

  • Merge to: master (production-ready)

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