Added test from #815 to verify #814 is fixed. (Release branch commit counts are reset incorrectly)

Author: JakeGinnivan

src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs

@@ -329,4 +329,35 @@ 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.2");
+        }
+    }
 }