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

Warning: not deleting branch 'hotfix-XXX' that is not yet merged to #407

Open
koenverwimp opened this issue Jul 25, 2024 · 2 comments
Open

Comments

@koenverwimp
Copy link

Since a while we get this error when finishing a hotfix branch. Do you know what could be the root cause? It worked before, but we might have updated to a new versions of your plugin.

[ERROR] Failed to execute goal com.amashchenko.maven.plugin:gitflow-maven-plugin:1.20.0:hotfix-finish (default-cli) on project helm-whs: hotfix-finish: warning: not deleting branch 'hotfix-24.6.9' that is not yet merged to
[ERROR] 'refs/remotes/origin/hotfix-24.6.9', even though it is merged to HEAD.
[ERROR] error: The branch 'hotfix-24.6.9' is not fully merged.
[ERROR] If you are sure you want to delete it, run 'git branch -D hotfix-24.6.9'.
[ERROR] -> [Help 1]
[ERROR]
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException

@koenverwimp
Copy link
Author

It looks to be a duplicate for #350

@koenverwimp
Copy link
Author

koenverwimp commented Jul 25, 2024

Ah i now see that it is related to the fact that we use a SNAPSHOT on the hotfix branch. The plugin does the version change before merging it to master, and create a commit on the hotfix branch. The git command that you do for removing the branch complains about having a hotfix branch locally that is not in sync with the origin because of this 1 commit, and doesn't want to delete the branch.

So related to this property: useSnapshotInHotfix

Anything we can do about this?

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

No branches or pull requests

1 participant