support to not update/merge develoment-branch on hotfit-finish

[Iridias]

In case one don't want to have any changes done to development-branch when finishing a hotfix.

[aleksandr-m]

@Iridias Why not? You will probably have merge conflicts during release.

[Iridias]

The change would better fit our processes. In happens more often, that change is already merged into development-branch before the hotfix-branch is released/finished. That could lead to merge-conflicts in the other direction - when merging the hotfix-branch into development-branch. As there is no resume-function in this plugin, it is easier for automation to have the option to disable the merging of hotfix into development.

[glianeric]

@aleksandr-m Hi Aleksandr,

I agree with Iridias. The maven plugin you have greated is great, and I would like to use it - but I really need to control merging. To answer your question, the reason is that I don't intend to follow pure gitflow, and I need flexibility. Your plugin provides a very large amount of what I need, but I don't want to be forced into following the exact gitflow methodology.
Philosophy aside, here is the exact scenario:

I have a repository with master and develop branches, and tags pointing to releases. For argument's sake, we have tags 1.0.0, 1.0.1, 1.1.0, 1.2.0, 2.0.0

1. I wish to hotfix an old release, and all I have is a tag pointing to it (I do not and will never have release branches hanging around). Let's say version 1.0.1.
2. I generate a hotfix branch from this tag (manually for now, let's say) and make any changes to the POM that I need, such as setting the correct development version (1.0.2-SNAPSHOT) - I'm not involving 'hotfix-start' here because it's not in the scope of this request.
3. I run hotfix-finish after my commits are done. If it attempts to merge to develop, there will be a conflict.

So, I need to tell it to not merge - it is the developer's responsibility to merge the change back into develop ... my hotfix branch only need to be tagged, and then deleted, so now I will have an additional tag, 1.0.2 pointing to my hotfixed changed.

I don't want to use release or support branches, and I have good reasons (well, what I believe to be good reasons) for this. I just want the hotfix to happen and then that branch can dissapear, leaving only the tag. No merging anywhere.

PS: To be clear, I have a very large automated release process, and the release portion is never handled on a developer's machine. So, a lot of flexibility is needed to remove obstructions to automation.