Failing test for feature inheriting from parent named development

Author: rcknight

GitVersionCore.Tests/IntegrationTests/FeatureBranchScenarios.cs

@@ -1,10 +1,38 @@
+using System;
 using GitVersion;
 using LibGit2Sharp;
 using NUnit.Framework;
 
 [TestFixture]
 public class FeatureBranchScenarios
 {
+    [Test]
+    public void ShouldInheritIncrementCorrectlyWithMultiplePossibleParentsAndWeirdlyNamedDevelopBranch()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.0");
+            fixture.Repository.CreateBranch("development");
+            fixture.Repository.Checkout("development");
+
+            //Create an initial feature branch
+            var feature123 = fixture.Repository.CreateBranch("feature/JIRA-123");
+            fixture.Repository.Checkout("feature/JIRA-123");
+            fixture.Repository.MakeCommits(1);
+
+            //Merge it
+            fixture.Repository.Checkout("development");
+            fixture.Repository.Merge(feature123, new Signature("me", "[email protected]", DateTimeOffset.Now));
+
+            //Create a second feature branch
+            fixture.Repository.CreateBranch("feature/JIRA-124");
+            fixture.Repository.Checkout("feature/JIRA-124");
+            fixture.Repository.MakeCommits(1);
+
+            fixture.AssertFullSemver("1.1.0-JIRA-124.1+2");
+        }
+    }
+
     [Test]
     public void ShouldNotUseNumberInFeatureBranchAsPreReleaseNumberOffDevelop()
     {