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
488 stars 180 forks source link

More than one release branch exists #308

Closed selvasm closed 2 years ago

selvasm commented 2 years ago

Dears,

We are working on creation of release and hotbranch. During which we were able to successfully able to create a new release version (0.0.1) using command "mvn gitflow:release-start" and later finished the release branch using "mvn gitflow:release-finish".

But later when we were able to create a new release branch for version (0.1.0), using command "mvn gitflow:release-start" , and try to finish the branch creation using "mvn gitflow:release-finish", it fails with error "Failed to execute goal com.amashchenko.maven.plugin:gitflow-maven-plugin:1.15.0:release-finish (default-cli) on project mytest release-finish: More than one remote release branch exists. Cannot finish release"

[INFO] Checking for uncommitted changes. [DEBUG] git diff --no-ext-diff --ignore-submodules --quiet --exit-code [DEBUG] git diff-index --cached --quiet --ignore-submodules HEAD -- [DEBUG] git for-each-ref --format="%(refname:short)" refs/heads/release/TM- [INFO] Fetching remote branch 'origin '. [DEBUG] git fetch --quiet origin [DEBUG] git for-each-ref --format="%(refname:short)" refs/remotes/origin/release/mytest- "origin/release/mytest-0.0.1" "origin/release/mytest-0.1.0"

Ideally,

Could you please help us in achieving the same? Please let know if more information is required.

Configuration of the plugin.

`

true
<commitDevelopmentVersionAtStart>true</commitDevelopmentVersionAtStart>
<pushRemote>true</pushRemote>
<fetchRemote>true</fetchRemote>
<allowSnapshots>true</allowSnapshots>
<keepBranch>true</keepBranch>
<versionDigitToIncrement>1</versionDigitToIncrement>
<skipFeatureVersion>true</skipFeatureVersion>
`
aleksandr-m commented 2 years ago

Why do you need multiple release branches? Can you use support branches instead?

aleksandr-m commented 2 years ago

Duplicate of https://github.com/aleksandr-m/gitflow-maven-plugin/issues/217. Please add additional details there, if any.