New feature finish option -p
This will first pull changes on development then merge your feature
qnd but works like a charm for me ;)
cause / explanation: http://stackoverflow.com/questions/10197188/git-flow-branches-have-diverged
you should test before push ;)
else should not force
This might not work on all environments! Didn't digged into, if there is a git-flow function for that?!
rough copy of the require_branches_equal()