Skip to content

Git Flow

Andrew Magana edited this page Nov 11, 2020 · 15 revisions
  1. All new work should be done in a new feature branch either in this repo or in a contributor's personal fork of this repo.
  2. When ready, the contributor should submit a PR from their feature branch (either in this repo or their fork) to the develop branch, which then must pass all checks
  3. Another user should either approve the PR, reject the PR, or request changes
  4. Then, if the PR was approved, the contributor who submitted the PR should
    1. Merge the PR to the develop branch
    2. Create a PR from develop to master
    3. Merge the PR to master and run a git pull to update the master branch locally.
    4. Create a tag on the head of the master branch with git tag -a 'v1.0.0' -m 'tag description' where v1.0.0 is the version (with the v prefix), and tag description is a description of the changes in the new tag (Note: make this description meaningful because it will be used to automatically create a new release in Github)
    5. Push the new tag to this repo with git push origin --tags
    6. Wait for build automation to complete and edit the drafted release details as appropriate, then publish.
Clone this wiki locally