How should gitflow hotfixes work?

Question

We use Gitflow for our web builds, and I have a question about how hotfixes are supposed to work. But first I should explain that we don\'t quite use the n

Answer 1

For first picture in this link

I don't see why there would be many conflicts. The changes which are merged to develop are only the latest hotfix, of maybe previous hotfixes, if they were not merged for some reason in their turn.

(though I would rather merge the hotfix into master, and them merged master to develop, instead of directly merging hotfix to develop, just to avoid criss-cross merges, but it should not change much)