Feature/add nodevelopmerge to hotfix finish

[chenjianjx]

Hi,

The flag "nodevelopmerge" has been added to "release finish". Now I added it to "hotfix finish" as well.

This is almost mandatory if the hotifx is run using some web console such as gitlab ci/cd pipeline ,because

• The changes in a hotfix can easily cause a merge conflict when it's merged to develop. The hotfix branch is based from "master" branch, which is normally behind "develop" branch, so merge conflict can easily happen.
• You can fix the merge conflict if you are just running git flow on your local computer. But if it's run on a web console, there is no way to fix the conflict and the job on the console will just fail.

The change is similar to one made for release finish: https://github.com/petervanderdoes/gitflow-avh/pull/317

Hopefully this can be accepted

[ChrisJStone]

I'm in the process of updating gitflow. If you could kindly resubmit your pull request against my fork here as it appears this fork is no longer being updated.