Skip to content

Refactor merge conflict checker workflow#13183

Open
DaanHoogland wants to merge 1 commit into
mainfrom
DaanHoogland-patch-7
Open

Refactor merge conflict checker workflow#13183
DaanHoogland wants to merge 1 commit into
mainfrom
DaanHoogland-patch-7

Conversation

@DaanHoogland
Copy link
Copy Markdown
Contributor

@DaanHoogland DaanHoogland commented May 18, 2026

Updated workflow triggers and permissions for merge conflict checker.

Description

This PR...

Fixes: #13181

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)
  • Build/CI
  • Test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

Updated workflow triggers and permissions for merge conflict checker.
@codecov
Copy link
Copy Markdown

codecov Bot commented May 18, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 18.08%. Comparing base (5893ba5) to head (38a0e54).

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #13183      +/-   ##
============================================
- Coverage     18.09%   18.08%   -0.01%     
+ Complexity    16723    16718       -5     
============================================
  Files          6037     6037              
  Lines        542580   542580              
  Branches      66427    66427              
============================================
- Hits          98155    98136      -19     
- Misses       433399   433417      +18     
- Partials      11026    11027       +1     
Flag Coverage Δ
uitests 3.51% <ø> (ø)
unittests 19.25% <ø> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Copy link
Copy Markdown
Member

@vishesh92 vishesh92 left a comment

Choose a reason for hiding this comment

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

clgtm. We will need to merge and test to check if it's working or not.
Regarding the frequency of 10 minutes, this will currently result in 144 runs in a day. I am assuming that is fine for us.

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

@sonarqubecloud
Copy link
Copy Markdown

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

PR Merge Conflict Check fails on PRs

3 participants