diff --git a/src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs index 0a0e917d85..68958a348b 100644 --- a/src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs +++ b/src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs @@ -330,4 +330,36 @@ public void HotfixOffReleaseBranchShouldNotResetCount() fixture.AssertFullSemver(config, "2.0.0-beta.7"); } } + + [Test] + public void MergeOnReleaseBranchShouldNotResetCount() + { + var config = new Config + { + AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag, + VersioningMode = VersioningMode.ContinuousDeployment, + }; + using (var fixture = new EmptyRepositoryFixture()) + { + const string TaggedVersion = "1.0.3"; + fixture.Repository.MakeATaggedCommit(TaggedVersion); + fixture.Repository.CreateBranch("develop"); + fixture.Repository.Checkout("develop"); + fixture.Repository.MakeACommit(); + + fixture.Repository.CreateBranch("release/2.0.0"); + + fixture.Repository.CreateBranch("release/2.0.0-xxx"); + fixture.Repository.Checkout("release/2.0.0-xxx"); + fixture.Repository.MakeACommit(); + fixture.AssertFullSemver(config, "2.0.0-beta.1"); + + fixture.Repository.Checkout("release/2.0.0"); + fixture.Repository.MakeACommit(); + fixture.AssertFullSemver(config, "2.0.0-beta.1"); + + fixture.Repository.MergeNoFF("release/2.0.0-xxx"); + fixture.AssertFullSemver(config, "2.0.0-beta.3"); + } + } } \ No newline at end of file