Conflict during release-finish when using commitDevelopmentVersionAtStart & useSnapshotInRelease

[philharperv]

How to replicate:

Set the following properties

commitDevelopmentVersionAtStart = true
useSnapshotInRelease = true

Run release-start

• Creates a release branch and increases the version in the development branch.

Run release-finish

• Removes the SNAPSHOT from the version in the release branch
• Tags and merges into master
• Merges into development branch

At this point there is a conflict because there was a commit in the development branch to increase the version and there was a commit in the release branch to remove the SNAPSHOT from the version.

Example Conflict

++<<<<<<< HEAD
 +        <version>0.4.2-SNAPSHOT</version>
++=======
+         <version>0.4.1</version>
++>>>>>>> release/0.4.1

Thanks,

Phil

[philharperv]

I am not sure what the best fix for this is. But one approach would be to increase the version and add SNAPSHOT after merging the release branch into master but before merging it back into develop.

[philharperv]

Thanks for merging this in for us. Do you have an idea as to when you will release the latest version to maven repository?

[aleksandr-m]

@philharperv 1.11.0 is released.