DEV Community

Discussion on: Git Branching and Branching Strategy

Collapse
 
ryanbuening profile image
Ryan Buening

How do you handle hotfixes into master/production if the develop/staging branch has changes (maybe new features) that cannot be pulled into production yet?

Collapse
 
preethamsathyamurthy profile image
Preetham

Though not a frequent occurence and should be avoided, but in those specific scenarios, we can create a new branch from master, test the hotfix and create a pull request to master which should be validated and approved by people other than the dev who makes the change.
P.S.
Do suggest a methodology incase you have something in mind

Collapse
 
shvahabi profile image
Shahed

Oh not acceptable, since you mess up with master branch. My methodology is to have another permanent branch release which can serve as source/target of hotfixes.