T7878: Using mergify rule to handle conflict checks for private repo - #1047
Merged
Conversation
|
👍 |
dmbaturin
approved these changes
Sep 29, 2025
dmbaturin
left a comment
Member
There was a problem hiding this comment.
I have no objections against the change.
Just a note: please do not use https://vyos.dev/T6707 as a parent for these tasks. This isn't even related to the release workflow at all. Those tasks should also have better (at the very least, non-empty) descriptions to make it clear what exactly is being done and why.
sever-sever
approved these changes
Sep 29, 2025
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: