Skip to content

T7878: Using mergify rule to handle conflict checks for private repo - updated label - #1055

Merged
kumvijaya merged 1 commit into
vyos:currentfrom
kumvijaya:current
Oct 10, 2025
Merged

T7878: Using mergify rule to handle conflict checks for private repo - updated label#1055
kumvijaya merged 1 commit into
vyos:currentfrom
kumvijaya:current

Conversation

@kumvijaya

Copy link
Copy Markdown
Contributor

Change summary

Mergify Conflict Label Fix

Mergify automatically adds and removes a label named conflicts (plural) when pull requests have merge conflicts.
Our existing configuration used conflict (singular), which caused Mergify to fail to toggle the label properly.

Problem

  • Mergify’s default behavior expects the label name conflicts.
  • Our rule defined the label as conflict.
  • As a result, the label wasn’t removed when merge conflicts were resolved.

Resolution

Updated the rule to use the correct label name:

actions:
  label:
    toggle:
      - conflicts

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes)
  • Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
  • Other (please describe):

Related Task(s)

https://vyos.dev/T7878

Related PR(s)

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly

@github-actions

github-actions Bot commented Oct 9, 2025

Copy link
Copy Markdown

👍
No issues in PR Title / Commit Title

@github-actions github-actions Bot added the current VyOS rolling release label Oct 9, 2025

@sever-sever sever-sever 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.

Fix label

@kumvijaya
kumvijaya merged commit 315c1df into vyos:current Oct 10, 2025
8 of 9 checks passed
@vyosbot vyosbot added mirror-initiated This PR initiated for mirror sync workflow mirror-completed and removed mirror-initiated This PR initiated for mirror sync workflow labels Oct 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

current VyOS rolling release mirror-completed

Development

Successfully merging this pull request may close these issues.

5 participants