#Hotfixes in master git Patch#

Recently, I tried to create a hotfix to change a single line of copy in one file. In Gitflow, this branches from master, and when you finish the hotfix, this gets merged into master and developД«ut how does this not cause massive problems?

#Hotfixes in master git Patch#

You then want to patch an immediate issue with a hotfix branch. So, I understand these issues, and I don't believe they're contributing to the issue I have now, but just in case, this is how we use it. We were aware that this is not how Gitflow is designed, but we needed a branching model of some sort, so we (sort of) solved this by cherrypicking commits instead of merging branches.

This did cause problems as the feature branches were branched from develop which was way ahead of master merging these feature branches into master would merge other changes into master (changes that were present in develop at the time the feature was branched that weren't yet in master). However, as this is client work, we don't do 'releases', instead features are deployed as and when they are required, so changes from our feature branches are merged into master on an ad-hoc basis. I understand that usually you would branch your features, they would merge into develop when finished, you would create your release, release gets merged into master and you deploy that, as an actual 'versioned release'. But first I should explain that we don't quite use the normal Gitflow workflow.

We use Gitflow for our web builds, and I have a question about how hotfixes are supposed to work.