Skip to content

Commit 10de8b0

Browse files
hyperpolymathclaude
andcommitted
fix(ci): resolve leftover merge-conflict markers in 3 files
.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>
1 parent 2e74cb6 commit 10de8b0

3 files changed

Lines changed: 0 additions & 12 deletions

File tree

.github/FUNDING.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
21
# SPDX-License-Identifier: MPL-2.0
3-
=======
4-
# SPDX-License-Identifier: MPL-2.0
5-
>>>>>>> 1b58383 (chore: sync from parent repo automation)
62
# Funding platforms for hyperpolymath projects
73
# See: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/displaying-a-sponsor-button-in-your-repository
84

.github/workflows/instant-sync.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
21
# SPDX-License-Identifier: MPL-2.0
3-
=======
4-
# SPDX-License-Identifier: MPL-2.0
5-
>>>>>>> 1b58383 (chore: sync from parent repo automation)
62
# Instant Forge Sync - Triggers propagation to all forges on push/release
73
name: Instant Sync
84

.github/workflows/semgrep.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
21
# SPDX-License-Identifier: MPL-2.0
3-
=======
4-
# SPDX-License-Identifier: MPL-2.0
5-
>>>>>>> 1b58383 (chore: sync from parent repo automation)
62
name: Semgrep SAST
73

84
on:

0 commit comments

Comments
 (0)