- Open a "Pull request" in GitHub, in order to merge the hotfix branch onto the stable branch, and reqeust a review from the team
- Once the team approves the pull request, the branch can be merged using the "Squash and merge" strategy, be sure to not delete the hotfix branch
- Open a second "Pull request" in GitHub, in order to merge the hotfix branch onto the master branch
- Once again, once the team approves the pull request, the branch can be merged using the "Squash and merge" strategy, this time the branch can be deleted
- If some conflict between the master and the hotfix branch arises, don't worry, they can be fixed right away when merging online. Resolve the conflict by porting the new lines from the hotfix branch into the master branch version of the file.
-Finally, delete the hotfix branch from the local repository
- Once the team approves the pull request, the branch can be merged using the "Squash and merge" strategy. Be sure to delete the hotfix branch after it gets merged
- Open a second "Pull request" in GitHub, in order to merge the stable branch with the new hotfix onto the master branch
- Once again, as soon as the team approves the pull request, the branch can be merged, but now you have to select the "Create a merge commit" strategy. You have to insert the following commit message: "Merging latest bugfix onto master."
- If some conflict between the master and the stable branch arises, don't worry, they can be fixed right away when merging online. Resolve the conflict by porting the new lines from the stable branch into the master branch version of the file.
-You can now delete the hotfix branch from the local repository
`git branch -D fix-issue-xxx`
- Check out once again into master branch
`git checkout master`
- Update local master branch with remote copy
`git pull origin master`
- Check out once again into stable branch
`git checkout stable`
- Update local stable branch with remote copy
`git pull origin stable`
- Now that the hotfix is on the online repository, a new tag can be created onto the stable branch. In order to do this, go to the releases page of the repository, and select "Draft a new release". Fill the "Tag version" and "Release title" fields according to the previous releases. Also, be sure to select the stable branch as target and to check "This is a pre-release" if you are not sure if your release is ready to be deployed on production line.
- Open a "Pull request" in GitHub for team to verify the feature
- Once the team approves the pull request, the branch can be merged using the "Squash and merge" strategy, and it can be deleted from the online repository
-Finally, delete the feature branch from the local repository
-You can now delete the feature branch from the local repository
