search

aleksandr-m / gitflow-maven-plugin

The Git-Flow Maven Plugin supports various Git workflows, including GitFlow and GitHub Flow. This plugin runs Git and Maven commands from the command line.
https://aleksandr-m.github.io/gitflow-maven-plugin/
Apache License 2.0
494 stars 182 forks source link

Release branch and hotfix branch at same time #390

Open EricMorel35 opened 1 year ago

EricMorel35 commented 1 year ago

Hi,

A question about the plugin's behaviour. I have a release branch and a hotfix one which are living at same time. Let's suppose that the hotfix is finished before the feature. so the modifications are merged into main (or master) and according plugin's behaviour into release branch. I was expecting that the modifications will be copied into develop because I set noBackMergeHotfix to true.

Is there any reasons which explain this behaviour ?

Regards,

aleksandr-m commented 1 year ago

When release branch exists changes will be merged into it instead of develop. The noBackMergeHotfix parameter handles branch merging to develop when there is no release branch.