T7878: conflict check updated to use mergify#45
Merged
dmbaturin merged 2 commits intovyos:currentfrom Oct 20, 2025
Merged
Conversation
sever-sever
approved these changes
Oct 20, 2025
Member
sever-sever
left a comment
There was a problem hiding this comment.
Use mergify for conflict checking
dmbaturin
approved these changes
Oct 20, 2025
Member
dmbaturin
left a comment
There was a problem hiding this comment.
Simple CI change, no objections.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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
Related Task(s)
https://vyos.dev/T7878Related PR(s)
Checklist: