feat: resolve increments from merged branches

src/GitVersion.Core.Tests/IntegrationTests/FeatureBranchScenarios.cs

@@ -322,11 +322,13 @@ public void ShouldPickUpVersionFromMainAfterReleaseBranchMergedBack()
             // merge release into main
             fixture.Checkout(MainBranch);
             fixture.MergeNoFF("release/1.0.0");
-            fixture.AssertFullSemver("1.0.1-2", configuration);
+            fixture.AssertFullSemver("1.1.0-2", configuration);
 
             // create a feature branch from main and verify the version
             fixture.BranchTo("feature/test");
-            fixture.AssertFullSemver("1.0.1-test.1+2", configuration);
+            fixture.AssertFullSemver("1.1.0-test.1+2", configuration);
+            fixture.MakeACommit();
+            fixture.AssertFullSemver("1.1.0-test.1+3", configuration);
         }
     }
 
@@ -412,11 +414,11 @@ public void ShouldPickUpVersionFromMainAfterReleaseBranchMergedBack()
                 // merge release into main
                 fixture.Checkout(MainBranch);
                 fixture.MergeNoFF("release/1.0.0");
-                fixture.AssertFullSemver("1.0.1-2", configuration);
+                fixture.AssertFullSemver("1.1.0-2", configuration);
 
                 // create a misnamed feature branch (i.e. it uses the default configuration) from main and verify the version
                 fixture.BranchTo("misnamed");
-                fixture.AssertFullSemver("1.0.1-misnamed.1+2", configuration);
+                fixture.AssertFullSemver("1.1.0-misnamed.1+2", configuration);
             }
         }
     }