Hello Mr, i'm not guru but i'm using GIT as well,i also work on a dev branch and when it is done i merge into master, when a bug remains i work in two different ways:

- When the bug is complex or i need to change a bulk of files i create a new branch from master, and when it is fixed, merge into master and in all others branches


- When not too complex i fix in my new branch and them 'cherry-pick' [1] the commit in master and others branches

[1] https://stackoverflow.com/questions/...-with-git-mean

I'm not sure if it's the best practice using git so keep studying and if you can, share with us please.