For example, say version 1.2.1 is the current production release running live and causing troubles due to a severe bug. If we need to make an additional hotfix, or collection of hotfixes, is the correct workflow to pull a copy of main, create a local hotfix branch, make the hotfixes, then merge them back into development and main, and create a new tag like 1.0.2, and then switch the production site to track 1.0.2, or is there a way that we can create the hotfix branch off the most recent release (in this case, 1.0.1), make the hotfix(es), and then push them back up? Hotfix branches are created from the master branch. As the name implies, a hotfix branch is used to fix a critical problem in. Our production site is currently set to track and deploy to the 1.0.1 release. Theres another kind of supporting branch that needs mentioning, hotfix branches.
Edit: You might as well want to use the -s or -u
git checkout master Switched to branch 'master' git merge -no-ff hotfix-1.2.1 Merge made by recursive.
#Hotfixes in master git update
We currently have our first release, tagged 1.0, and a hotfix release of 1.0.1 already in our repository. First, update master and tag the release. Our team is moving to the gitflow model for development of our current website project, and I have a little confusion/questioning about proper workflow. It is possible to automatically push after finishing a git flow branch. LKML Archive on help / color / mirror / Atom feed -mm merge plans for 2.6.
0 kommentar(er)
