Skip to content

Latest commit

 

History

History
186 lines (118 loc) · 5.26 KB

5-hotfix.md

File metadata and controls

186 lines (118 loc) · 5.26 KB
Raw

5. Hotfix

Date Phase
February 5th Hotfix

This morning the project manager received a frantic call from the EIC of Flavor magazine. The app was so successful that the writers have been inundated with emails from readers submitting their own recipes for consideration. The number of emails has been so great that their inboxes are completely useless. The magazine wants your team to remove the writers' email addresses from the app ASAP.

🏃 Activities

Follow along with the activities below to walk through the process of creating a hotfix branch, creating a feature branch for the changes, getting changes merged into the hotfix, then merging the hotfix into both the master and develop branches.

1 - Create the Hotfix Branch

Maintainers

Create a branch off of master named hotfix-1.0.1:

$ git checkout master
# switch to master branch

$ git checkout -b hotfix-1.0.1
# create & switch to hotfix branch

Bump the patch number contained in the VERSION file:

major=1
minor=0
patch=1

Stage and commit your change:

$ git add app/VERSION
# stage changes to the version file

$ git commit -m "Bump version to 1.0.1"

👮 ✋ - Please wait until everyone has caught up.

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

2 - Publish the Hotfix Branch

Maintainers

Choose a maintainer to publish the hotfix branch. This maintainer should push the branch to origin:

$ git push -u origin HEAD

👮 ✋ - Please wait until everyone has caught up.

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

3 - Make Changes in Feature Branch

Developers

Fetch the latest from origin and create a local tracking branch for the hotfix:

$ git fetch origin
# fetch latest from origin

$ git checkout hotfix-1.0.1
# checkout the hotfix branch
Branch hotfix-1.0.1 set up to track remote branch hotfix-1.0.1 from origin.
Switched to a new branch 'hotfix-1.0.1'

💡 As long as only one of your remotes has a branch called hotfix-1.0.1, it knows to create a local tracking branch.

Create a feature branch named remove-emails off of the hotfix branch.

$ git checkout -b remove-emails

After removing the email addresses from the main page (/app/index.md), stage and commit the change:

$ git add app/index.md

$ git commit -m "Remove email addresses from app"

👮 ✋ - Please wait until everyone has caught up.

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

4 - Publish and Request to Merge Feature Branch

Developers

Choose a developer to publish the fixup branch and create a Pull Request against the hotfix branch.

Publish the branch:

$ git push -u me HEAD

Navigate to your GitHub fork and open the pull request, making sure to request to merge changes into the hotfix-1.0.1 branch.

👮 ✋ - Please wait until everyone has caught up.

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

4 - Finish Hotfix Branch

Maintainers

Choose a maintainer to accept the new pull request to merge the hotfix branch into master,.

👮 ✋ - Please wait until everyone has caught up.

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

5 - Merge Back into develop

Next we will work to get the hotfix merged back down into develop, so switch to the hotfix branch and pull down all the latest changes:

$ git checkout hotfix-1.0.1
# switch to hotfix branch

$ git pull
# pull latest changes

💡 Running git pull on a tracking branch will automatically fetch and merge changes.

Merge hotfix into develop, creating a new merge commit (via --no-ff):

$ git checkout develop

$ git pull

$ git merge --no-ff hotfix-1.0.1

💡 Always make sure that develop is up to date before merging. There may be some merge conflicts that will need to be addressed at this point.

Push the commit up to the origin repository:

$ git push

Next

Next we will walk through the process of cutting a new release branch.

Go

Quick Links