This repository is an example of the following workflow:
- Master is in a state you would like to deploy. Make a version branch off master called something like "v_2_6".
- Change the capistrano deploy file to point to a tag called "v2.6", rather than a branch, and commit it. Tag that commit on that branch with "v2.6".
- Merge the "v_2_6" branch into master with a PR, without deleting the branch.
- Deploy the changes to staging, and production if all looks good.
- Oh no! We discover a new bug in a serializer on staging/production.
- We make a branch off of "v_2_6", called "v_2_6_serializer_fix".
- We fix the bug on the "v_2_6_serializer_fix" branch, and make a PR into "v_2_6".
- Assuming the PR is approved, we merge it in, and delete "v_2_6_serializer_fix"
- We change capistrano to deploy a tag called "v2.6.1", and commit this on "v_2_6"
- We tag this commit "v2.6.1" and push up all tags.
- Make a PR to Merge "v_2_6" into master again, merge without deleting the branch, thus preserving the latest bugfix on master.
- Deploy the changes to staging, and production if all looks good.
- Repeat steps 5-12 as necessary, bumping the minor version each time.
- When master is in a state where we are ready to launch the next build, make a new branch like "v_2_7" off of master, repeat the process.