Skip to content

Latest commit

 

History

History
91 lines (59 loc) · 3.17 KB

7-release-bugs.md

File metadata and controls

91 lines (59 loc) · 3.17 KB
Raw

7. Release Bugs

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.

🏃 Activities

Follow along with the activities below to walk through the process of fixing issues in the release branch.

1 - Fix Issues in Feature Branches

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:

    1. Create a feature branch off of release-1.1 named last-months-favorites.
    2. Commit the following changes to the feature branch:
      1. Create a section in /app/index.md titled "Last Month's Favorites".
      2. Copy the text that was published last release and paste under "Last Month's Favorites". Be sure not to include John Lemon.

  • Developer 2:

    1. Create a feature branch off of release-1.1 named remove-john-lemon.
    2. Commit the following changes to the feature branch:
      1. Delete the file /app/writer/john-lemon.md.
      2. Remove references to John Lemon from /app/index.md

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.

🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧

2 - Publish & Request to Merge Feature Branches

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.

🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧

3 - Merge Feature Requests into Release Branch

Maintainers

Review the developer Pull Requests and merge them into release-1.1.

Next

Finally, we will walk through the process of completing a release: merging into master, back down into develop, and creating a GitHub release tag.

Go

Quick Links