"git flow feature rebase" will rebase against its base branch instead of "develop"
Added --preserve-merges option to "git flow feature rebase"
Added --preserve-merges option to "git flow feature finish"