Skip to content

Conversation

@Borda
Copy link
Member

@Borda Borda commented Jan 21, 2026

This pull request makes a minor update to the pull request conflict labeling workflow by removing the removeOnDirtyLabel configuration from the .github/workflows/pr-conflict-labeler.yml file. This simplifies the workflow configuration.


The removeOnDirtyLabel parameter is configured with the same value as dirtyLabel. This parameter should specify labels to remove when a PR becomes dirty (has conflicts), not the label that indicates conflicts. Setting both to "has conflicts" creates a logical conflict. Either remove this parameter entirely (the action automatically removes dirtyLabel when conflicts are resolved), or set it to a different label like "ready to merge" if you want to remove that label when conflicts appear.

@Borda Borda requested a review from SkalskiP as a code owner January 21, 2026 23:25
Copilot AI review requested due to automatic review settings January 21, 2026 23:25
Copy link
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.

Pull request overview

This pull request fixes a configuration issue in the PR conflict labeling workflow by removing the incorrectly configured removeOnDirtyLabel parameter. The parameter was redundantly set to the same value as dirtyLabel ("has conflicts"), which creates a logical conflict. The action automatically handles removing the dirty label when conflicts are resolved, making this parameter unnecessary.

Changes:

  • Removed the removeOnDirtyLabel parameter from the PR conflict labeler workflow configuration

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@Borda Borda changed the title Remove conflicted removeOnDirtyLabel parameter from PR conflict lab… Remove conflicted removeOnDirtyLabel from PR conflict labeling Jan 21, 2026
@codecov
Copy link

codecov bot commented Jan 21, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 52%. Comparing base (1bab3ff) to head (3da1379).
⚠️ Report is 1 commits behind head on develop.

Additional details and impacted files
@@           Coverage Diff           @@
##           develop   #2092   +/-   ##
=======================================
  Coverage       52%     52%           
=======================================
  Files           61      61           
  Lines         7076    7076           
=======================================
  Hits          3657    3657           
  Misses        3419    3419           
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@Borda Borda changed the title Remove conflicted removeOnDirtyLabel from PR conflict labeling ci: Remove conflicted removeOnDirtyLabel from PR labeling Jan 22, 2026
@Borda Borda enabled auto-merge (squash) January 22, 2026 12:10
@Borda Borda merged commit 8419279 into develop Jan 22, 2026
31 checks passed
@Borda Borda deleted the ci/pr-conflict branch January 22, 2026 12:10
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.

3 participants