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
POM Conflicts on feature-finish #238
Comments
I would really appreciate some insight on this. Thanks. |
Update it to what version? Develop? What if feature version is greater than develop one? |
I kind of assumed it would be to the current develop version as feature-finish is pretty much saying that you want to merge the feature into the current develop branch and whatever state/version it is in will be preserved. If you wanted it into a different version then I guess you would first set develop to that version before merging. |
Maybe have some option/flag to indicate that feature-finish must adopt/keep the develop branch version. |
I've added a PR to enable this by setting retainDevelopVersion=true |
Is this possible with release branches too? I am encountering the same issue where we have upgraded the release pom to include a CI build number (To ensure we don't build with old dependencies), and when we finish the release branch it causes the same conflict you're seeing here. |
First off, thanks so much for a great tool!
One challenge I am having is with merge conflicts on all POM files in a project (multi module) when I follow a fairly simple flow like this:
Am I doing something wrong? My expectation would be that gitflow would automagically update the version in the FEAT-1 POMs before merging to develop branch so that there are no merge conflicts in the POMs? I'm sure its a common scenario for a feature to be finished after the develop branch has had some version changes?
Any guidance would be greatly appreciated.
The text was updated successfully, but these errors were encountered: