How to create a hotfix branch in Git

Arif Billah Babu

git

Creating a hotfix branch in Git is a common practice to address urgent issues or bugs in a stable release while development on the main branch continues. Here are the steps to create a hotfix branch:

Switch to the Main Branch: Before creating a hotfix branch, make sure you are on the main branch (usually master or main).
```
bash
git checkout main
git pull origin main  # Make sure you have the latest changes from the main branch
```
Create the Hotfix Branch: Create a new branch for your hotfix. You can name it something like hotfix/issue-number or hotfix/descriptive-name.
```
bash
git checkout -b hotfix/issue-number
```
Make Changes: Make the necessary changes to fix the issue in your hotfix branch. Commit your changes as you would in any regular branch.
```
bash
git add .
git commit -m "Fix issue #123: Describe the fix"
```
Push the Hotfix Branch: Once you've made the necessary changes and committed them, push the hotfix branch to the remote repository.
```
bash
git push origin hotfix/issue-number
```
Create a Pull Request (Optional): If your project uses pull requests, create one for the hotfix branch. This allows for code review and discussion before merging the hotfix into the main branch.
Merge the Hotfix: After the changes have been reviewed and approved, merge the hotfix branch into the main branch.
```
bash
git checkout main
git merge hotfix/issue-number
```
Tag the Release: After merging the hotfix, consider tagging the release to mark the point where the hotfix was applied.
```
bash
git tag -a v1.0.1 -m "Version 1.0.1 with hotfix for issue #123"
git push origin v1.0.1
```

Clean Up: Finally, you can delete the hotfix branch if you no longer need it.

bash
git branch -d hotfix/issue-number  # locally
git push origin --delete hotfix/issue-number  # remotely

Remember to adapt the branch names and version numbers based on your project's conventions. Always follow your team's Git workflow and guidelines.