hotfix fails if hotfix_finish contains wrong next snapshot version

[DG0lden]

Steps to reporduce:

• put some version, lets say 20-SNAPSHOT to develop branch
• start hotfix with other version, say 19.1
• do some hotfix work
• finish hotfix with hotfix_finish.sh 19.1 22

IS:
hotfix fails with merge conflict

SHOULD:
hotfix shall not change develop branch version

[borisskert]

This isnt a real fail. In this case the script is answering:

# Okay, you have got a conflict while merging onto develop
# but don't panic, in most cases you can easily resolve the conflicts (in some cases you even do not need to merge all).
# Please do so and continue the hotfix finishing with the following command:
git push --atomic origin master develop hotfix-VERSION --follow-tags # all or nothing

The occurring conflict is rather easy to solve at least manually.

The actual problem is, the script is adjusting the release version for the hotfix and trying to merge this into develop. In any case you will get a changed version in your develop but in my opinion it should not contain the same version of the master branch in which the hotfix_finish is also merging into.

How can i fix it? I don't have a solution for your problem except the solution the script is suggesting to you in this case.

Automatically resolving conflict is dangerous in this case because if you get conflicts in your code you are not able to have a look into it.

[DG0lden]

How about adding flag --merge-hotfix-to-develop=true/false ?
In some cases real changes would require complex merging and it shall not block hotfix release (can be done later on)