Repository navigation
fix(ci): resolve leftover merge-conflict markers across 13 files - #38
Merged
Merged
Conversation
.github/workflows/generator-generic-ossf-slsa3-publish.yml and 12
.machine_readable/6a2/*.a2ml files (root + scripts/ copies) all had
unresolved <<<<<<< HEAD / ======= / >>>>>>> markers committed straight
to main from commit d09ab6f ("chore: batch RSR compliance").
- Workflow file: both sides pinned actions/checkout@v4 to different
SHAs. Kept 11bd71901bbe5b1630ceea73d27597364c9af683, matching the
pin used consistently elsewhere across the estate right now.
- The 12 .a2ml files: HEAD side was the correct .a2ml format (per this
estate's own documented A2ML standard); the other side was stale
content in the old, superseded .scm (Scheme s-expression) format
that shouldn't have merged back in. Kept HEAD, discarded the .scm
content.
A file with literal conflict markers isn't valid YAML/config, so CI
has been failing on every PR against this repo regardless of the PR's
own diff, since the problem lives in the base branch, not any
individual PR.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
|
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
1 participant
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.
Summary
.github/workflows/generator-generic-ossf-slsa3-publish.ymland 12.machine_readable/6a2/*.a2mlfiles (root +scripts/copies) all had unresolved<<<<<<< HEAD/=======/>>>>>>>markers committed straight tomainfrom commitd09ab6f("chore: batch RSR compliance").Resolution
actions/checkout@v4to different SHAs (mechanical choice) — kept11bd71901bbe5b1630ceea73d27597364c9af683, matching the pin used consistently elsewhere across the estate right now..a2mlfiles: this one needs your eyes —HEADwas the correct.a2mlformat (matching this estate's documented A2ML standard), the other side was stale content in the old, superseded.scmformat that shouldn't have merged back in. I keptHEAD's content and discarded the.scmside entirely. Please confirm that's the right call before merging — I didn't attempt to reconcile any data differences between the two sides (e.g. dates, completion percentages), just picked the correct-format side.A file with literal conflict markers isn't valid YAML/config, so CI has been failing on every PR against this repo regardless of the PR's own diff, since the problem lives in the base branch, not any individual PR's changes.
🤖 Generated with Claude Code