Repository navigation
ci: refuse conflict markers on release/0.7.x - #3215
Merged
Merged
Conversation
Ports the conflict-marker scan from #3174 by hand, so a draft backport with committed conflicts cannot merge onto the line with ci-success green. The backport bot cannot do this port, because its token has no workflows permission. Adds scripts/check-conflict-markers.sh, its test, and the conflict-markers job under ci-success.
Contributor
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the
|
Contributor
|
Approved: no findings at Nothing to do. Clobber: none: the files are new and the |
norrietaylor
added a commit
that referenced
this pull request
Nov 10, 2026
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.
Ports the conflict-marker scan from #3174 to
release/0.7.xby hand. Bryan's review finding 4 on #3174: the line has no marker scan, so a draft conflict backport marked ready too early could merge withci-successgreen.Changes
scripts/check-conflict-markers.shandscripts/check-conflict-markers_test.sh, copied unchanged from ci(release): backport by label, block conflict markers, and merge the line back #3174. The test runs undercrates/common/tests/shell_harnesses.rs, which the line already has.conflict-markersjob inci.yml, added toci-success'sneeds. It is the same job as on ci(release): backport by label, block conflict markers, and merge the line back #3174.The backport bot cannot make this port itself: its token has no
workflowspermission.Order
This is a precondition for setting
BACKPORT_ENABLED, not for rc2. It can merge before #3174; the scan stands on its own.Test plan
412b9d24).scripts/check-conflict-markers_test.sh: 12 pass.