Skip to content

CRE-1827: detect potential merge conflicts#21255

Merged
mchain0 merged 7 commits intodevelopfrom
cre-1827
Feb 20, 2026
Merged

CRE-1827: detect potential merge conflicts#21255
mchain0 merged 7 commits intodevelopfrom
cre-1827

Conversation

@mchain0
Copy link
Contributor

@mchain0 mchain0 commented Feb 20, 2026

Little GitHub Action early detecting potential conflicts with the new code.

Goal is to better coordinate the merging efforts across the team(s) and encourage team work to minimize the risks of working on the same codebase parts.

It's very simple - will check open PRs and report if there is a risk of a conflicting work onto the target branch:
✅ No conflicts with other open PRs targeting develop
or
Will list potentially conflicting PRs.

One can use it to minimize the foot print and coordinate bigger refactors with others not to interrupt their work by enforcing massive rebases.

CRE-1827

@mchain0 mchain0 added skip-smoke-tests Skips E2E tests. Best for draft PRs to save on GitHub Runners. skip-e2e-regression Skips regression system tests labels Feb 20, 2026
@github-actions
Copy link
Contributor

github-actions bot commented Feb 20, 2026

✅ No conflicts with other open PRs targeting develop

@mchain0 mchain0 marked this pull request as ready for review February 20, 2026 13:04
@mchain0 mchain0 requested review from a team as code owners February 20, 2026 13:04
@mchain0 mchain0 requested review from jmank88 and skudasov and removed request for kalverra February 20, 2026 13:05
@mchain0 mchain0 enabled auto-merge February 20, 2026 13:34
@mchain0 mchain0 requested review from chainchad February 20, 2026 13:38
@jmank88 jmank88 requested review from erikburt and kalverra February 20, 2026 13:42
Tofel
Tofel previously approved these changes Feb 20, 2026
@trunk-io
Copy link

trunk-io bot commented Feb 20, 2026

Static BadgeStatic BadgeStatic BadgeStatic Badge

View Full Report ↗︎Docs

@mchain0 mchain0 added this pull request to the merge queue Feb 20, 2026
@cl-sonarqube-production
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

Merged via the queue into develop with commit a244590 Feb 20, 2026
98 checks passed
@mchain0 mchain0 deleted the cre-1827 branch February 20, 2026 15:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

skip-e2e-regression Skips regression system tests skip-smoke-tests Skips E2E tests. Best for draft PRs to save on GitHub Runners.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

Comments