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
490 stars 182 forks source link

Create next development version in release branch before merge with develop #300

Open RastislavGraus opened 3 years ago

RastislavGraus commented 3 years ago

Hallo, we use another kind of save merge from release branch to develop. We make following steps:

  1. fork release branch
  2. set release version in pom and commit (as achieved using gitflow:release-start)
  3. merge release branch with master branch
  4. set next development version in pom and commit in release branch
  5. merge release branch with development branch

I have introduced new parameter mergeDevelopmentVersion in gitflow:release-finish goal to control this scenario. Default value for new parameter is false. The value of new parameter is ignored if the commitDevelopmentVersionAtStart parameter is set to true.