Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

RastislavGraus
Copy link

@RastislavGraus RastislavGraus commented May 18, 2021

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant