fix merge pom's conflict on release finish using the option useSnapshotInRelease

[hfatela]

fixes the issue #122

I hit the same problem. I dig into the code and apply the same solution the old gitflow did. The only way to solve this is to set the version of the release into the develop branch before the merge and later revert this change back.

[jjlharrison]

Hey @aleksandr-m, sorry to nudge, but is there a reason (other than the conflict) that this pull request can't be merged? This is a bit of a blocker for us adopting this plugin. Thanks.

[aleksandr-m]

@jjlharrison Have you tested this solution? Does it work for you?

@hfatela Can you fix conflicts.

[hfatela]

I can, but only by the end of the day or tomorrow morning. We are using this in my company since I upload the change in a private build with no issues. A second test in a different environment would be good. Regards

…

On Mon, Nov 12, 2018 at 7:33 PM Aleksandr Mashchenko < ***@***.***> wrote: @jjlharrison <https://github.com/jjlharrison> Have you tested this solution? Does it work for you? @hfatela <https://github.com/hfatela> Can you fix conflicts. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#123 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ATz6NsSWuWS9f9TvQIajscA_7mCJRcfEks5uuczwgaJpZM4WAQy9> .

[pipwilson]

@hfatela At my workplace we have been using your change in production for a couple of months with no issue. Getting this merged would allow us to stop using our fork :)

[hfatela]

ok, it was easier than I thought, so I did it now.

[aleksandr-m]

@hfatela Thanks.

[aleksandr-m]

@pipwilson @hfatela 1.11.0 is out.