Has anyone got a working pipelines solution for the following git problem?
We cut a feature branch off of develop, merge it back into develop, cut a release branch off of develop and merge it into master - this automatically deploys and works fine.
The issue then is if any hotfixes are done as hotfix/ branches off of master, trying to work out a solution to sync those changes back to develop so they're included in the next release branch.
