[v0.27] ci: add conflict marker detection to prevent accidental merges (#3466) #3516
Conversation
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
backport PRs with commitConflicts enabled can have unresolved conflict markers committed to the branch. while visible in the diff, nothing prevents accidentally merging these PRs. adds a ci check that: - scans for conflict markers (<<<<<<, ======, >>>>>>) - posts a pr comment listing files and line numbers - fails the check to block merging refs: OPS-461 (cherry picked from commit 20a2710)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Backport from
maintov0.27Original PR Nr.: #3466
Backported Commits:
backport PRs with commitConflicts enabled can have unresolved conflict
markers committed to the branch. while visible in the diff, nothing
prevents accidentally merging these PRs.
adds a ci check that:
refs: OPS-461