Skip to content

Add some tests for making a feature branch off of a release or a hotfix branch #1596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

asbjornu
Copy link
Member

Rebase and conflict resolvement of #1277. Resolves #1277, fixes #1275.

…ix branch

# Conflicts:
#	src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs
@asbjornu asbjornu merged commit 02807b2 into GitTools:master Feb 20, 2019
@asbjornu asbjornu deleted the feature/feature-branch-on-release-or-hotfix branch February 20, 2019 12:01
@asbjornu asbjornu added this to the 5.0.0 milestone Feb 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

GitVersion produces version with wrong commit count (release branch with feature branches on it)
3 participants