GitHub Flow - IvanAlvarezEnri/dragon-squad-api GitHub Wiki

As our PR Tair recommended, we have chosen the methodology of Github flow https://guides.github.com/introduction/flow/ but using a develop branch to apply our changes and only using MASTER to make deployments to heroku.

GitHuw Flow example

Branches

  • Master
  • Develop
  • Features, all branches must meet the following standards:
    • lower case.
    • Hyphen between words (new-feature).

Commit policy

No matter how many commits you want to do, we decided to do baby steps for each feature. It should we as clear as possible, explaining what you have done to avoid to see the code to understand your attached message.

Before to push

  • Run an Rspec, all new and old test must pass.
  • Play with postman too

Pull request

  • Always merge with your parent branch, develop usually
  • Fix conflicts
  • Choose Tair as a reviewer