fix(ci): resolve leftover merge-conflict markers in 3 files#72
Merged
Conversation
.github/workflows/instant-sync.yml, .github/workflows/semgrep.yml, and .github/FUNDING.yml all had unresolved <<<<<<< HEAD / ======= / >>>>>>> markers committed straight to main from a prior "sync from parent repo automation" merge. In all three cases both sides of the conflict were identical (a duplicated SPDX header line) — collapsed to one copy. A file with literal conflict markers isn't valid YAML, so CI (including CodeQL's "actions" language analysis) 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/instant-sync.yml,.github/workflows/semgrep.yml, and.github/FUNDING.ymlall had unresolved<<<<<<< HEAD/=======/>>>>>>>markers committed straight tomainfrom a prior "sync from parent repo automation" merge. In all three cases both sides were identical (a duplicated SPDX header line) — collapsed to one copy, no other content change.A file with literal conflict markers isn't valid YAML, 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 itself, not any individual PR's changes.
🤖 Generated with Claude Code