| Date | Phase |
|---|---|
| February 24th | Release |
The magazine is happy with the work that has been done, but has asked that the recipes picked for january appear on the home screen under the heading "Last Month's Favorites". Oh and by the way, John Lemon has been fired so please would you remove him from the application.
Follow along with the activities below to walk through the process of fixing issues in the release branch.
Developers
Fetch the latest from origin and create a local tracking branch for the release:
$ git fetch origin
# fetch latest from origin
$ git checkout release-1.1
# checkout the release branch
Branch hotfix-1.1 set up to track remote branch release-1.1 from origin.
Switched to a new branch 'hotfix-1.0.1'Choose two developers to address each issue.
-
Developer 1:
- Create a feature branch off of
release-1.1namedlast-months-favorites. - Commit the following changes to the feature branch:
- Create a section in
/app/index.mdtitled "Last Month's Favorites". - Copy the text that was published last release and paste under "Last Month's Favorites". Be sure not to include John Lemon.
- Create a section in
- Create a feature branch off of
-
Developer 2:
- Create a feature branch off of
release-1.1namedremove-john-lemon. - Commit the following changes to the feature branch:
- Delete the file
/app/writer/john-lemon.md. - Remove references to John Lemon from
/app/index.md
- Delete the file
- Create a feature branch off of
Other team members may also choose an issue and make the changes themselves locally to gain more practice working in feature branches.
👮 ✋ - Please wait until everyone has caught up.
🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧
Developers
The two developers from the last step should now publish their feature branches to GitHub and open up Pull Requests against the release-1.1 branch in the source repository:
$ git push -u me HEAD👮 ✋ - Please wait until everyone has caught up.
🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧
Maintainers
Review the developer Pull Requests and merge them into release-1.1.
Finally, we will walk through the process of completing a release: merging into master, back down into develop, and creating a GitHub release tag.