[Bug] wrong patch count after merging Release branch

[tomtom1976]

Describe the bug
After merging a feature branch to the main and merge back the main to development

the version number is build correct to 1.1.0 but the patches not.
GitVersion counts all commits after branching the develoment from the main

Expected Behavior

A Version number like 1.1.0-alpha.1 or like that

Actual Behavior

1.1.0-alpha.6 <- all commit after branching from master

[HHobeck]

Hi @tomtom1976 .

Thank's for your input. What version you are using? May I ask you to create a integration test for your scenario? It helps us alot. Please use the latest main branch which targeting the next release version 6.x.

    [Test]
    public void Just_A_Test()
    {
        // * 2373a87 58 minutes ago  (HEAD -> main)

        var configuration = GitFlowConfigurationBuilder.New
            .WithVersioningMode(VersioningMode.ContinuousDeployment)
            .WithBranch("main", builder => builder
                .WithLabel("ci")
                .WithVersioningMode(VersioningMode.ContinuousDeployment)
            )
            .Build();

        using var fixture = new EmptyRepositoryFixture();

        fixture.MakeACommit();

        // ✅ succeeds as expected
        fixture.AssertFullSemver("0.0.1-ci.1", configuration);

        // or

        // ❌ expected: 0.0.1-ci.5"
        fixture.AssertFullSemver("0.0.1-ci.1", configuration);

        fixture.Repository.DumpGraph();
    } 

[HHobeck]

I think it will be solved with #3438. @tomtom1976 please confirm

[arturcic]

🎉 This issue has been resolved in version 6.0.0-beta.2 🎉
The release is available on:

• GitHub Release
• Chocolatey Package
• .Net Global Tool

Your GitReleaseManager bot 📦🚀