Skip to content

T7878: conflict check updated to use mergify#45

Merged
dmbaturin merged 2 commits intovyos:currentfrom
kumvijaya:current
Oct 20, 2025
Merged

T7878: conflict check updated to use mergify#45
dmbaturin merged 2 commits intovyos:currentfrom
kumvijaya:current

Conversation

@kumvijaya
Copy link
Contributor

Change summary

Using a Mergify rule to handle conflict checks for a private repository.
Observed that Mergify detects conflicts more accurately and is more reliable compared to a custom action.

Note:
It is only for private repo., public repo will continue to use github workflow.

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

Copy link
Member

@sever-sever sever-sever left a comment

Choose a reason for hiding this comment

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

Use mergify for conflict checking

Copy link
Member

@dmbaturin dmbaturin left a comment

Choose a reason for hiding this comment

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

Simple CI change, no objections.

@dmbaturin dmbaturin merged commit 5285c78 into vyos:current Oct 20, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

4 participants