gitflow:hotfix-finish merge back to develop may merges wrong version into the develop branch

[Phillip Wirth]

Hello,

i like the question even if i have some trouble with it sometimes...

And thats why i started this topic.

I am using jgitflow like in THE git flow described http://nvie.com/posts/a-successful-git-branching-model/

So i will start a new hotfix from the master branch, e.g. mvn jgitflow:hotfix-start 

When this is done and i comitted some changes into the new branch I'd like to finish the hotfix and merge the changes back to the develop branch.

E.g. jgitflow:hotfix-finish (I typically use this in combination with -DpushHotfixes and -DnoDeploy)

The above operation will merge the changesd done to the hotfix branch back to the develop branch which is fine. BUT my hotfix branch has a different pom then my develop branch. (mostly only the version) 

Is there some kind to get around some issues, because now, when i merge back my hotfix to the develop branch, the develop branch has the hotfix vesion which is typically wrong.

Maybe its my fault and i am doing something wrong, is there some best practice on this?

Thank you

[Mateusz Koncikowski]

I was wondering the same thing.

[Jonathan Doklovic]

I'm not sure I understand...

hotfix-finish should merge into develop and master and keep the same versions they previously had. The hotfix branch should then be deleted.

Is this not happening?

[Mateusz Koncikowski]

Let say I have this versions:

master: 0.10

dev: 0.11-SNAPSHOT

hotfix-start

master:0.10

dev: 0.11-SNAPSHOT

hotfix-0.11.1

pushing some changes to hotfix branch

hotfix-finish:

master:0.11.1 <- it's ok

dev: changes from hotfix branch are merged in, which is ok, but in pom.xml i'd like to end up with my snapshot version 0.11-SNAPSHOT instead I have 0.11.1

hotfix: removed

[Phillip Wirth]

thank you for pointing this out, exactly this is my issue :)

[Jonathan Doklovic]

Can one of you log an issue for this?

On Thursday, January 16, 2014 5:10:36 AM UTC-8, Phillip Wirth wrote:

[Mateusz Koncikowski]

done, MJF-107