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

Feature finish should not fail on already merged feature branch. #228

Open
rostskadat opened this issue Apr 30, 2020 · 1 comment
Open

Comments

@rostskadat
Copy link

Description:

Call to feature-finish fails when the feature branch has been already merged. It fails with:

[ERROR] Failed to execute goal com.amashchenko.maven.plugin:gitflow-maven-plugin:1.14.1-SNAPSHOT:feature-finish (default-cli) on project TestProject: feature-finish: On branch develop
[ERROR] Your branch is up to date with 'origin/develop'.
[ERROR]
[ERROR] nothing to commit, working tree clean

Steps To Reproduce:

1- Create a feature branch on the TestProject
2- Do some development on that feature branch
3- Simulate an "delivery" (possibly intermediate) by merging the feature branch into develop
4- Call feature-finish

Expected Result:

I would expect the feature-finish goal to:
1- Consider that it is a valid state for the feature branch.
2- Carry on with the rest of the process.

@aleksandr-m
Copy link
Owner

It would be nice to have this controlled by some parameter, but then we need to check diff or dry-run it first.

Related #296

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

2 participants