-
Notifications
You must be signed in to change notification settings - Fork 23
Git Flow
Andrew Magana edited this page Nov 11, 2020
·
15 revisions
- 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.
- 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 - Another user should either approve the PR, reject the PR, or request changes
- Then, if the PR was approved, the contributor who submitted the PR should
- Merge the PR to the
develop
branch - Create a PR from
develop
tomaster
- Merge the PR to
master
and run agit pull
to update the master branch locally. - Create a tag on the head of the master branch with
git tag -a 'v1.0.0' -m 'tag description'
wherev1.0.0
is the version (with the v prefix), andtag 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) - Push the new tag to this repo with
git push origin --tags
- Wait for build automation to complete and edit the drafted release details as appropriate, then publish.
- Merge the PR to the