Skip to content

fix: ignore mainline merges from same branch#4793

Merged
asbjornu merged 2 commits into
GitTools:mainfrom
HHobeck:hotfix/4056-ignore-mainline-merges
Dec 21, 2025
Merged

fix: ignore mainline merges from same branch#4793
asbjornu merged 2 commits into
GitTools:mainfrom
HHobeck:hotfix/4056-ignore-mainline-merges

Conversation

@HHobeck

@HHobeck HHobeck commented Dec 19, 2025

Copy link
Copy Markdown
Contributor

Description

Related Issue

Resolves #4056

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@HHobeck HHobeck force-pushed the hotfix/4056-ignore-mainline-merges branch from e5224af to 1ade08b Compare December 19, 2025 14:28

@asbjornu asbjornu left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Comment thread src/GitVersion.Core.Tests/VersionCalculation/NextVersionCalculatorTests.cs Outdated
@sonarqubecloud

Copy link
Copy Markdown

@HHobeck

HHobeck commented Dec 21, 2025

Copy link
Copy Markdown
Contributor Author

@asbjornu: Do you know why it is blocked?

@asbjornu asbjornu merged commit 91eff5c into GitTools:main Dec 21, 2025
118 checks passed
@asbjornu asbjornu deleted the hotfix/4056-ignore-mainline-merges branch December 21, 2025 12:43
@mergify

mergify Bot commented Dec 21, 2025

Copy link
Copy Markdown
Contributor

Thank you @HHobeck for your contribution!

@asbjornu

Copy link
Copy Markdown
Member

@HHobeck no. I just ignored and merged.

@thomhurst

Copy link
Copy Markdown

Any chance we can get a release with this in?

@aashishc94-git

Copy link
Copy Markdown

Hello ,
In which release can we expect this fix ?
Thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[ISSUE]: NotImplementedException in TrunkBased-Workflow

4 participants