#159 Applied the same fix as in #19 in order to solve the pom.xml ver…

[iulvalSPL]

…sion conflict when a hotfix branch gets merged into a release branch

[aleksandr-m]

@iulvalSPL I assume it happens because both commitDevelopmentVersionAtStart and useSnapshotInHotfix are set to true. Can you add an if statement like in this commit.

[iulvalSPL]

@aleksandr-m I think those two fields do not matter that much.
What matters is having the hotfix branch with a different version than the release branch.
When you create a hotfix branch, you get the option of overwriting the default version value.

What is the hotfix version? [2.13]: 2.13.1

If you change this default (like we do), then you will get a conflict with or without commitDevelopmentVersionAtStartand useSnapshotInHotfix

I am thinking to add an if to check if the hotfix version is different than the release version instead.

I have committed two integration tests to address the non default hotfix version scenarios, with or without commitDevelopmentVersionAtStartand useSnapshotInHotfix

[aleksandr-m]

Different versions doesn't mean automatically that there will be merge conflicts. Maybe if on commitDevelopmentVersionAtStart and useSnapshotInHotfix is more appropriate. Or maybe we should check which version is ahead and use that version?

Not sure that current solution is good for all use cases. Nevertheless, let's merge it and see what next issues arise with that.