Skip to content

Conversation

@bmmathe
Copy link

@bmmathe bmmathe commented May 22, 2016

Feature branch created after finishing a release (gitflow) should inherit the develop branch version. Fixes #788.

@bmmathe
Copy link
Author

bmmathe commented May 22, 2016

Here is a real world scenario of the issue I'm trying to reproduce in the test.

We use gitflow to manage our SDLC. Release branches are created before we merge into master using SourceTree's Git Flow button. We "Create Release", commit the branch, and then push. If tests pass on that release branch and no further changes are necessary we "Finish Release" which merges the release branch into master and develop. We also tag the master commit with the production version. Develop commits after the merge increment the version number properly however feature branches do not increment properly. This seems to be only the case if there was no commit on the release branch. If there is a commit on the release branch it seems like feature branches do get the appropriate version number.

Here is a screen shot of the versions that GitVersion is creating.

image

And here is the commit graph.

image

@asbjornu
Copy link
Member

@bmmathe Thanks for this! But can you please rebase on master so it gets the fixes in #876 that ensures the Travis build is run?

…erit the develop branch version

Feature branch created after finishing a release (gitflow) should
inherit the develop branch version
@JakeGinnivan
Copy link
Contributor

This will be fixed by #832

One of the changes this this branch makes is to change the tag on develop to alpha instead of unstable. I am not sure if this should be released as a Minor release. Thoughts?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants