[ISSUE]: Sem Version downgrade after completing a release branch

[RoyMalkaKornit]

Prerequisites

• I have written a descriptive issue title
• I have searched issues to ensure it has not already been reported

GitVersion package

AzureDevops task

GitVersion version

6.0.5

Operating system

Windows

What are you seeing?

We are using GitVersion 6.0.5 with the following configuration
workflow: GitFlow/v1 branches: main: label: '' develop: label: dev feature: label: f-{BranchName} release: label: '' support: label: beta
after completing a release branch ( merge back into develop & main branches ) and creating Git tag on main we experienced a downgrade in sem version ( calculated by the number of commits ).
This is the GitVersion log before completing the release :

2024-12-19T11:26:05.4942018Z INFO [24-12-19 13:26:03:18] -< End: [Using 'MergeMessageVersionStrategy' strategy] (Took: 61.96ms) >-
2024-12-19T11:26:05.4942350Z INFO [24-12-19 13:26:03:18] -< Begin: [Using 'TaggedCommitVersionStrategy' strategy] >-
2024-12-19T11:26:05.4943906Z INFO [24-12-19 13:26:03:56] Git tag '4.9.0': Version increment '4.9.0' +semver 'Minor' with label 'f-FixaMixPhase2' based on commit '4393eba'.
2024-12-19T11:26:05.4944330Z INFO [24-12-19 13:26:03:56] Git tag '4.8.0': Version increment '4.8.0' +semver 'Minor' with label 'f-FixaMixPhase2' based on commit '59da30d'.
2024-12-19T11:26:05.4944742Z INFO [24-12-19 13:26:03:56] Git tag '4.5.0': Version increment '4.5.0' +semver 'Minor' with label 'f-FixaMixPhase2' based on commit '118d77b'.
2024-12-19T11:26:05.4945151Z INFO [24-12-19 13:26:03:56] Git tag '4.1.1': Version increment '4.1.1' +semver 'Minor' with label 'f-FixaMixPhase2' based on commit '26b3e9d'.
2024-12-19T11:26:05.4945567Z INFO [24-12-19 13:26:03:56] Git tag '4.4.0': Version increment '4.4.0' +semver 'Minor' with label 'f-FixaMixPhase2' based on commit '26b3e9d'.
2024-12-19T11:26:05.4945982Z INFO [24-12-19 13:26:03:56] Git tag '4.1.0': Version increment '4.1.0' +semver 'Minor' with label 'f-FixaMixPhase2' based on commit '4d73dbb'.
2024-12-19T11:26:05.4946398Z INFO [24-12-19 13:26:03:56] Git tag '4.2.0': Version increment '4.2.0' +semver 'Minor' with label 'f-FixaMixPhase2' based on commit '4d73dbb'.
2024-12-19T11:26:05.4946811Z INFO [24-12-19 13:26:03:56] Git tag '4.3.0': Version increment '4.3.0' +semver 'Minor' with label 'f-FixaMixPhase2' based on commit '4d73dbb'.
2024-12-19T11:26:05.4947187Z INFO [24-12-19 13:26:03:56] -< End: [Using 'TaggedCommitVersionStrategy' strategy] (Took: 382.21ms) >-
2024-12-19T11:26:05.4947551Z INFO [24-12-19 13:26:03:56] -< Begin: [Using 'TrackReleaseBranchesVersionStrategy' strategy] >-
2024-12-19T11:26:05.4947906Z INFO [24-12-19 13:26:03:75] -< Begin: Finding merge base between 'release/4.10.0' and 'feature/FixaMixPhase2'. >-
2024-12-19T11:26:05.4948318Z INFO [24-12-19 13:26:03:77] Found merge base of ''ac1c10a' - Merged PR 26674: Add barcode failure transitions to manual loading states (DB creator only)'
2024-12-19T11:26:05.4948708Z INFO [24-12-19 13:26:03:80] next merge base --> '9c66ebb' - Merged PR 25905: add-ox-validation
2024-12-19T11:26:05.4949042Z INFO [24-12-19 13:26:03:83] next merge base --> '8d354c2' - Increment Version NO_CI
2024-12-19T11:26:05.4949411Z INFO [24-12-19 13:26:03:85] Merge base of 'release/4.10.0' and 'feature/FixaMixPhase2' is ''8d354c2' - Increment Version NO_CI'
2024-12-19T11:26:05.4949808Z INFO [24-12-19 13:26:03:86] -< End: Finding merge base between 'release/4.10.0' and 'feature/FixaMixPhase2'. (Took: 108.32ms) >-
2024-12-19T11:26:05.4950243Z INFO [24-12-19 13:26:03:86] Release branch exists -> Version in branch name: Version increment '4.10.0' +semver 'Minor' with label 'f-FixaMixPhase2' based on commit '8d354c2'.
2024-12-19T11:26:05.4951383Z INFO [24-12-19 13:26:03:86] -< Begin: Finding merge base between 'origin/release/4.10.0' and 'feature/FixaMixPhase2'. >-
2024-12-19T11:26:05.4951790Z INFO [24-12-19 13:26:03:87] Found merge base of ''ac1c10a' - Merged PR 26674: Add barcode failure transitions to manual loading states (DB creator only)'
2024-12-19T11:26:05.4952178Z INFO [24-12-19 13:26:03:91] next merge base --> '9c66ebb' - Merged PR 25905: add-ox-validation
2024-12-19T11:26:05.4952509Z INFO [24-12-19 13:26:03:94] next merge base --> '8d354c2' - Increment Version NO_CI
2024-12-19T11:26:05.4952880Z INFO [24-12-19 13:26:03:96] Merge base of 'origin/release/4.10.0' and 'feature/FixaMixPhase2' is ''8d354c2' - Increment Version NO_CI'
2024-12-19T11:26:05.4953287Z INFO [24-12-19 13:26:03:96] -< End: Finding merge base between 'origin/release/4.10.0' and 'feature/FixaMixPhase2'. (Took: 108.30ms) >-
2024-12-19T11:26:05.4953732Z INFO [24-12-19 13:26:03:97] Release branch exists -> Version in branch name: Version increment '4.10.0' +semver 'Minor' with label 'f-FixaMixPhase2' based on commit '8d354c2'.
2024-12-19T11:26:05.4954160Z INFO [24-12-19 13:26:03:97] -< End: [Using 'TrackReleaseBranchesVersionStrategy' strategy] (Took: 403.98ms) >-
2024-12-19T11:26:05.4955173Z INFO [24-12-19 13:26:03:97] -< Begin: [Using 'VersionInBranchNameVersionStrategy' strategy] >-
2024-12-19T11:26:05.4955509Z INFO [24-12-19 13:26:03:97] -< End: [Using 'VersionInBranchNameVersionStrategy' strategy] (Took: 0.04ms) >-
2024-12-19T11:26:05.4955866Z INFO [24-12-19 13:26:03:97] -< End: Fetching the base versions for version calculation... (Took: 14,384.91ms) >-
2024-12-19T11:26:05.4956206Z INFO [24-12-19 13:26:03:97] -------------------------------------------------------
2024-12-19T11:26:05.4956637Z INFO [24-12-19 13:26:03:97] Found multiple base versions which will produce the same SemVer (4.11.0-f-FixaMixPhase2.1), taking latest source for commit counting (Release branch exists -> Version in branch name)
2024-12-19T11:26:05.4957122Z INFO [24-12-19 13:26:03:97] Base version used: Release branch exists -> Version in branch name: Take '4.10.0' based on commit '8d354c2'.
2024-12-19T11:26:05.4957505Z INFO [24-12-19 13:26:03:97] -------------------------------------------------------
2024-12-19T11:26:05.4957851Z INFO [24-12-19 13:26:03:98] -< Begin: Using manual deployment workflow to calculate the incremented version. >-
2024-12-19T11:26:05.4958243Z INFO [24-12-19 13:26:04:00] 622 commits found between '8d354c2' - Increment Version NO_CI and 'bc3b325' - Merged PR 27551: Edit spray messages
2024-12-19T11:26:05.4958646Z INFO [24-12-19 13:26:04:00] -< End: Using manual deployment workflow to calculate the incremented version. (Took: 20.75ms) >-
2024-12-19T11:26:05.4959039Z INFO [24-12-19 13:26:04:00] -< Begin: Getting tagged semantic versions on branch 'refs/heads/develop'. TagPrefix: [vV]? and Format: Strict >-
2024-12-19T11:26:05.4959462Z INFO [24-12-19 13:26:04:65] -< End: Getting tagged semantic versions on branch 'refs/heads/develop'. TagPrefix: [vV]? and Format: Strict (Took: 653.67ms) >-
2024-12-19T11:26:05.4959897Z INFO [24-12-19 13:26:04:83] Found configuration file at 'C:\Agents\A1\121\s\PrinterCore.azuredevops\gitversion\GitVersion.yml'
2024-12-19T11:26:05.4960364Z INFO [24-12-19 13:26:04:83] -< Begin: Write version variables to cache file C:\Agents\A1\121\s\PrinterCore.git\gitversion_cache\BC7081915096724CEEC029F8FB403645B5B27B50 >-
2024-12-19T11:26:05.4960879Z INFO [24-12-19 13:26:05:08] -< End: Write version variables to cache file C:\Agents\A1\121\s\PrinterCore.git\gitversion_cache\BC7081915096724CEEC029F8FB403645B5B27B50 (Took: 250.84ms) >-
2024-12-19T11:26:05.4961348Z INFO [24-12-19 13:26:05:08] Found configuration file at 'C:\Agents\A1\121\s\PrinterCore.azuredevops\gitversion\GitVersion.yml'
2024-12-19T11:26:05.4961682Z Executing GenerateSetVersionMessage for 'AzurePipelines'.
2024-12-19T11:26:05.5181498Z Executing GenerateBuildLogOutput for 'AzurePipelines'.
2024-12-19T11:26:05.5208107Z {
2024-12-19T11:26:05.5208310Z "AssemblySemFileVer": "4.11.0.0",
2024-12-19T11:26:05.5208524Z "AssemblySemVer": "4.11.0.0",
2024-12-19T11:26:05.5208741Z "BranchName": "feature/FixaMixPhase2",
2024-12-19T11:26:05.5208952Z "BuildMetaData": 622,
2024-12-19T11:26:05.5209171Z "CommitDate": "2024-12-19",
2024-12-19T11:26:05.5209381Z "CommitsSinceVersionSource": 622,
2024-12-19T11:26:05.5209609Z "EscapedBranchName": "feature-FixaMixPhase2",
2024-12-19T11:26:05.5209901Z "FullBuildMetaData": "622.Branch.feature-FixaMixPhase2.Sha.bc3b3255c8b8e91ef49d14662d153e83732aa9f3",
2024-12-19T11:26:05.5210190Z "FullSemVer": "4.11.0-f-FixaMixPhase2.1+622",
2024-12-19T11:26:05.5210508Z "InformationalVersion": "4.11.0-f-FixaMixPhase2.1+622.Branch.feature-FixaMixPhase2.Sha.bc3b3255c8b8e91ef49d14662d153e83732aa9f3",
2024-12-19T11:26:05.5210784Z "Major": 4,
2024-12-19T11:26:05.5210975Z "MajorMinorPatch": "4.11.0",
2024-12-19T11:26:05.5211175Z "Minor": 11,
2024-12-19T11:26:05.5211351Z "Patch": 0,
2024-12-19T11:26:05.5211549Z "PreReleaseLabel": "f-FixaMixPhase2",
2024-12-19T11:26:05.5211770Z "PreReleaseLabelWithDash": "-f-FixaMixPhase2",
2024-12-19T11:26:05.5211989Z "PreReleaseNumber": 1,
2024-12-19T11:26:05.5212200Z "PreReleaseTag": "f-FixaMixPhase2.1",
2024-12-19T11:26:05.5213666Z "PreReleaseTagWithDash": "-f-FixaMixPhase2.1",
2024-12-19T11:26:05.5213899Z "SemVer": "4.11.0-f-FixaMixPhase2.1",
2024-12-19T11:26:05.5214134Z "Sha": "bc3b3255c8b8e91ef49d14662d153e83732aa9f3",
2024-12-19T11:26:05.5214355Z "ShortSha": "bc3b325",
2024-12-19T11:26:05.5214551Z "UncommittedChanges": 1,
2024-12-19T11:26:05.5214789Z "VersionSourceSha": "8d354c26efa1a116f2af71ddb9a834db1a75de1b",
2024-12-19T11:26:05.5215039Z "WeightedPreReleaseNumber": 30001
2024-12-19T11:26:05.5215222Z }

This is the GitVersion log on the feature after completing the release :

2024-12-19T11:26:05.4942018Z INFO [24-12-19 13:26:03:18] -< End: [Using 'MergeMessageVersionStrategy' strategy] (Took: 61.96ms) >-
2024-12-19T11:26:05.4942350Z INFO [24-12-19 13:26:03:18] -< Begin: [Using 'TaggedCommitVersionStrategy' strategy] >-
2024-12-19T11:26:05.4943906Z INFO [24-12-19 13:26:03:56] Git tag '4.9.0': Version increment '4.9.0' +semver 'Minor' with label 'f-FixaMixPhase2' based on commit '4393eba'.
2024-12-19T11:26:05.4944330Z INFO [24-12-19 13:26:03:56] Git tag '4.8.0': Version increment '4.8.0' +semver 'Minor' with label 'f-FixaMixPhase2' based on commit '59da30d'.
2024-12-19T11:26:05.4944742Z INFO [24-12-19 13:26:03:56] Git tag '4.5.0': Version increment '4.5.0' +semver 'Minor' with label 'f-FixaMixPhase2' based on commit '118d77b'.
2024-12-19T11:26:05.4945151Z INFO [24-12-19 13:26:03:56] Git tag '4.1.1': Version increment '4.1.1' +semver 'Minor' with label 'f-FixaMixPhase2' based on commit '26b3e9d'.
2024-12-19T11:26:05.4945567Z INFO [24-12-19 13:26:03:56] Git tag '4.4.0': Version increment '4.4.0' +semver 'Minor' with label 'f-FixaMixPhase2' based on commit '26b3e9d'.
2024-12-19T11:26:05.4945982Z INFO [24-12-19 13:26:03:56] Git tag '4.1.0': Version increment '4.1.0' +semver 'Minor' with label 'f-FixaMixPhase2' based on commit '4d73dbb'.
2024-12-19T11:26:05.4946398Z INFO [24-12-19 13:26:03:56] Git tag '4.2.0': Version increment '4.2.0' +semver 'Minor' with label 'f-FixaMixPhase2' based on commit '4d73dbb'.
2024-12-19T11:26:05.4946811Z INFO [24-12-19 13:26:03:56] Git tag '4.3.0': Version increment '4.3.0' +semver 'Minor' with label 'f-FixaMixPhase2' based on commit '4d73dbb'.
2024-12-19T11:26:05.4947187Z INFO [24-12-19 13:26:03:56] -< End: [Using 'TaggedCommitVersionStrategy' strategy] (Took: 382.21ms) >-
2024-12-19T11:26:05.4947551Z INFO [24-12-19 13:26:03:56] -< Begin: [Using 'TrackReleaseBranchesVersionStrategy' strategy] >-
2024-12-19T11:26:05.4947906Z INFO [24-12-19 13:26:03:75] -< Begin: Finding merge base between 'release/4.10.0' and 'feature/FixaMixPhase2'. >-
2024-12-19T11:26:05.4948318Z INFO [24-12-19 13:26:03:77] Found merge base of ''ac1c10a' - Merged PR 26674: Add barcode failure transitions to manual loading states (DB creator only)'
2024-12-19T11:26:05.4948708Z INFO [24-12-19 13:26:03:80] next merge base --> '9c66ebb' - Merged PR 25905: add-ox-validation
2024-12-19T11:26:05.4949042Z INFO [24-12-19 13:26:03:83] next merge base --> '8d354c2' - Increment Version NO_CI
2024-12-19T11:26:05.4949411Z INFO [24-12-19 13:26:03:85] Merge base of 'release/4.10.0' and 'feature/FixaMixPhase2' is ''8d354c2' - Increment Version NO_CI'
2024-12-19T11:26:05.4949808Z INFO [24-12-19 13:26:03:86] -< End: Finding merge base between 'release/4.10.0' and 'feature/FixaMixPhase2'. (Took: 108.32ms) >-
2024-12-19T11:26:05.4950243Z INFO [24-12-19 13:26:03:86] Release branch exists -> Version in branch name: Version increment '4.10.0' +semver 'Minor' with label 'f-FixaMixPhase2' based on commit '8d354c2'.
2024-12-19T11:26:05.4951383Z INFO [24-12-19 13:26:03:86] -< Begin: Finding merge base between 'origin/release/4.10.0' and 'feature/FixaMixPhase2'. >-
2024-12-19T11:26:05.4951790Z INFO [24-12-19 13:26:03:87] Found merge base of ''ac1c10a' - Merged PR 26674: Add barcode failure transitions to manual loading states (DB creator only)'
2024-12-19T11:26:05.4952178Z INFO [24-12-19 13:26:03:91] next merge base --> '9c66ebb' - Merged PR 25905: add-ox-validation
2024-12-19T11:26:05.4952509Z INFO [24-12-19 13:26:03:94] next merge base --> '8d354c2' - Increment Version NO_CI
2024-12-19T11:26:05.4952880Z INFO [24-12-19 13:26:03:96] Merge base of 'origin/release/4.10.0' and 'feature/FixaMixPhase2' is ''8d354c2' - Increment Version NO_CI'
2024-12-19T11:26:05.4953287Z INFO [24-12-19 13:26:03:96] -< End: Finding merge base between 'origin/release/4.10.0' and 'feature/FixaMixPhase2'. (Took: 108.30ms) >-
2024-12-19T11:26:05.4953732Z INFO [24-12-19 13:26:03:97] Release branch exists -> Version in branch name: Version increment '4.10.0' +semver 'Minor' with label 'f-FixaMixPhase2' based on commit '8d354c2'.
2024-12-19T11:26:05.4954160Z INFO [24-12-19 13:26:03:97] -< End: [Using 'TrackReleaseBranchesVersionStrategy' strategy] (Took: 403.98ms) >-
2024-12-19T11:26:05.4955173Z INFO [24-12-19 13:26:03:97] -< Begin: [Using 'VersionInBranchNameVersionStrategy' strategy] >-
2024-12-19T11:26:05.4955509Z INFO [24-12-19 13:26:03:97] -< End: [Using 'VersionInBranchNameVersionStrategy' strategy] (Took: 0.04ms) >-
2024-12-19T11:26:05.4955866Z INFO [24-12-19 13:26:03:97] -< End: Fetching the base versions for version calculation... (Took: 14,384.91ms) >-
2024-12-19T11:26:05.4956206Z INFO [24-12-19 13:26:03:97] -------------------------------------------------------
2024-12-19T11:26:05.4956637Z INFO [24-12-19 13:26:03:97] Found multiple base versions which will produce the same SemVer (4.11.0-f-FixaMixPhase2.1), taking latest source for commit counting (Release branch exists -> Version in branch name)
2024-12-19T11:26:05.4957122Z INFO [24-12-19 13:26:03:97] Base version used: Release branch exists -> Version in branch name: Take '4.10.0' based on commit '8d354c2'.
2024-12-19T11:26:05.4957505Z INFO [24-12-19 13:26:03:97] -------------------------------------------------------
2024-12-19T11:26:05.4957851Z INFO [24-12-19 13:26:03:98] -< Begin: Using manual deployment workflow to calculate the incremented version. >-
2024-12-19T11:26:05.4958243Z INFO [24-12-19 13:26:04:00] 622 commits found between '8d354c2' - Increment Version NO_CI and 'bc3b325' - Merged PR 27551: Edit spray messages
2024-12-19T11:26:05.4958646Z INFO [24-12-19 13:26:04:00] -< End: Using manual deployment workflow to calculate the incremented version. (Took: 20.75ms) >-
2024-12-19T11:26:05.4959039Z INFO [24-12-19 13:26:04:00] -< Begin: Getting tagged semantic versions on branch 'refs/heads/develop'. TagPrefix: [vV]? and Format: Strict >-
2024-12-19T11:26:05.4959462Z INFO [24-12-19 13:26:04:65] -< End: Getting tagged semantic versions on branch 'refs/heads/develop'. TagPrefix: [vV]? and Format: Strict (Took: 653.67ms) >-
2024-12-19T11:26:05.4959897Z INFO [24-12-19 13:26:04:83] Found configuration file at 'C:\Agents\A1\121\s\PrinterCore.azuredevops\gitversion\GitVersion.yml'
2024-12-19T11:26:05.4960364Z INFO [24-12-19 13:26:04:83] -< Begin: Write version variables to cache file C:\Agents\A1\121\s\PrinterCore.git\gitversion_cache\BC7081915096724CEEC029F8FB403645B5B27B50 >-
2024-12-19T11:26:05.4960879Z INFO [24-12-19 13:26:05:08] -< End: Write version variables to cache file C:\Agents\A1\121\s\PrinterCore.git\gitversion_cache\BC7081915096724CEEC029F8FB403645B5B27B50 (Took: 250.84ms) >-
2024-12-19T11:26:05.4961348Z INFO [24-12-19 13:26:05:08] Found configuration file at 'C:\Agents\A1\121\s\PrinterCore.azuredevops\gitversion\GitVersion.yml'
2024-12-19T11:26:05.4961682Z Executing GenerateSetVersionMessage for 'AzurePipelines'.
2024-12-19T11:26:05.5181498Z Executing GenerateBuildLogOutput for 'AzurePipelines'.
2024-12-19T11:26:05.5208107Z {
2024-12-19T11:26:05.5208310Z "AssemblySemFileVer": "4.11.0.0",
2024-12-19T11:26:05.5208524Z "AssemblySemVer": "4.11.0.0",
2024-12-19T11:26:05.5208741Z "BranchName": "feature/FixaMixPhase2",
2024-12-19T11:26:05.5208952Z "BuildMetaData": 622,
2024-12-19T11:26:05.5209171Z "CommitDate": "2024-12-19",
2024-12-19T11:26:05.5209381Z "CommitsSinceVersionSource": 622,
2024-12-19T11:26:05.5209609Z "EscapedBranchName": "feature-FixaMixPhase2",
2024-12-19T11:26:05.5209901Z "FullBuildMetaData": "622.Branch.feature-FixaMixPhase2.Sha.bc3b3255c8b8e91ef49d14662d153e83732aa9f3",
2024-12-19T11:26:05.5210190Z "FullSemVer": "4.11.0-f-FixaMixPhase2.1+622",
2024-12-19T11:26:05.5210508Z "InformationalVersion": "4.11.0-f-FixaMixPhase2.1+622.Branch.feature-FixaMixPhase2.Sha.bc3b3255c8b8e91ef49d14662d153e83732aa9f3",
2024-12-19T11:26:05.5210784Z "Major": 4,
2024-12-19T11:26:05.5210975Z "MajorMinorPatch": "4.11.0",
2024-12-19T11:26:05.5211175Z "Minor": 11,
2024-12-19T11:26:05.5211351Z "Patch": 0,
2024-12-19T11:26:05.5211549Z "PreReleaseLabel": "f-FixaMixPhase2",
2024-12-19T11:26:05.5211770Z "PreReleaseLabelWithDash": "-f-FixaMixPhase2",
2024-12-19T11:26:05.5211989Z "PreReleaseNumber": 1,
2024-12-19T11:26:05.5212200Z "PreReleaseTag": "f-FixaMixPhase2.1",
2024-12-19T11:26:05.5213666Z "PreReleaseTagWithDash": "-f-FixaMixPhase2.1",
2024-12-19T11:26:05.5213899Z "SemVer": "4.11.0-f-FixaMixPhase2.1",
2024-12-19T11:26:05.5214134Z "Sha": "bc3b3255c8b8e91ef49d14662d153e83732aa9f3",
2024-12-19T11:26:05.5214355Z "ShortSha": "bc3b325",
2024-12-19T11:26:05.5214551Z "UncommittedChanges": 1,
2024-12-19T11:26:05.5214789Z "VersionSourceSha": "8d354c26efa1a116f2af71ddb9a834db1a75de1b",
2024-12-19T11:26:05.5215039Z "WeightedPreReleaseNumber": 30001
2024-12-19T11:26:05.5215222Z }

Important Notes:

1. using Azure Devops
2. after each merge a 'PR commit' is created meaning that the latest commit on main branch is a commit that doesn't exist on develop

What is expected?

the number of commit will keep increasing ( > 622 )

Steps to Reproduce

1. create release branch release/4.10.0
2. create a feature branch from develop and perform commits
3. create commit on release branch
4. merge release back into develop and main ( using azure devops PR)
5. create tag on latest commit on main

RepositoryFixture Test

No response

Output log or link to your CI build (if appropriate).

[HHobeck]

Please provide steps to reproduce.

[RoyMalkaKornit]

I provided steps to reproduce, please let me know what more info do you need.