DiggidyDave commented on issue #6131: [SIP-12] Proposal for Branch Management and Release Process URL: https://github.com/apache/incubator-superset/issues/6131#issuecomment-475797533 Since people like working against master, let's assume gitflow with `master` and `stable` branches instead of `develop` and `master`... **Before the hotfix we have:** 2 branches, `master` and `stable` many tags: `v1.2.0`, `v1.1.1`, `v1.1.0`, `v1.0.0`, `v0.31.0` we support: `v1.2.0`, `v1.1.1` Summary of process... 1. **Bug is filed**, maintainers determine that it is a non-regression that repros back to `v1.1.1`. So they tag the issue as `release:1.1.1` or something to denote that decision. 2. **Bug fix is made on top of v1.1.1** by doing a `git checkout -b hotfix-1.1.1 v1.1.1` to create a new branch from the v1.1.1 release. They fix and test the fix in the branch. When it is validated, release votes etc happen if necessary, and the tip of the branch is tagged `v1.1.2`. The branch can now be deleted (it is no longer needed) and release artifacts can be published from `v1.1.2`. 3. **Bug fix is merged on top of v1.2.0** by doing a `git checkout -b hotfix-1.2.0` to create a new branch from the v1.2.0 release, followed by a `git merge v1.1.1`. The fix is tested in the branch. When it is validated, release votes etc happen if necessary, and the tip of the branch is tagged `v1.2.1`. The branch can now be deleted (it is no longer needed) and release artifacts can be published from `v1.2.1`. 4. **A PR is created for v1.2.0 into master**, and normal PR stuff happens. **After the hotfix we have:** 2 branches, `master` and `stable` many tags: `v1.2.1`, `v1.2.0`, `v1.1.2`, `v1.1.1`, `v1.1.0`, `v1.0.0`, `v0.31.0` we support: `v1.2.1`, `v1.1.2`
---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
