Gitflow Hotfix Overview

Gitflow Hotfix Overview

Git flow starting a new Hotfix Git flow adding commits to a new Hotfix Git Flow finishing a hotfix

Git Flow finishing a hotfix

Once the hotfix development / fix is completed, we have to finish the hotfix branch, while finishing a hotfix the updates (commits) from this branch will be merged with develop and master branches and the hotfix branch will be deleted.

In the post Git flow starting a new Hotfix, we saw on how to start a new hotfix using git flow, and in the post “Git flow adding commits to a new Hotfix” we saw on how to add / update changes to the new hotfix. In this post we shall see on how to finish the changes made to the new hotfix.

Git flow adding commits to a new Hotfix

In the post Git flow starting a new Hotfix, we saw on how to start a new hotfix using git flow, in this post we shall see on adding / updating changes to the new hotfix.

In this post I will be adding a new file to an existing hotfix branch. Let me add a new file “Git Hotfix.docx” to the new hotfix branch Hotfix1.

Git flow starting a new Hotfix

A Hotfix is started when there are bugs / issues in production. Starting a hotfix creates a new hotfix branch from the master branch. The testing and big fixing activities will be carried out in the hotfix branch. Once the code is stable without any issues, the hotfix is finished; this will merge the changes made to the hotfix branch to develop and main branches and delete the hotfix branch.

In this post we shall see on how to create a new release (branch) and start working on the new release. In the post Creating a Git-Flow branching structure usingSource Tree, we have seen on how to setup Git-flow. Once the setup is done you can follow the below steps to create a new release branch.