Merging Git Flow Feature Branch after Hotfixes?
There's nothing wrong with occasionally merging develop into your feature branch to keep it up to date. git is pretty good at merging, but if both branches touched the same parts of a file, you'll probably have to resolve some conflicts manually. I prefer to use a graphical merge tool for conflict resolution, see e.g. this guide for some tips how to set that up.