From fa1cba8b0bb44ffd3fc6693e247f94d679250619 Mon Sep 17 00:00:00 2001 From: "Jonathan D.A. Jewell" <6759885+hyperpolymath@users.noreply.github.com> Date: Thu, 6 Aug 2026 04:22:12 +0100 Subject: [PATCH] fix(ci): resolve a git merge conflict committed into pages.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pages.yml contains unresolved conflict markers on main: # SPDX-License-Identifier: MPL-2.0 <<<<<<< HEAD # Copyright (c) 2026 Jonathan D.A. Jewell (hyperpolymath) ... # # pages.yml — GitHub Pages deployment via Ddraig SSG. ======= >>>>>>> 5c04edd (fix(ci): add missing SPDX header to pages.yml) name: GitHub Pages (Ddraig SSG) So the file is not YAML at all, and the workflow has never run: GitHub Actions rejects it before creating any job — `failure`, no jobs, no log, no check run. Nothing surfaced it because a conflicted file still commits cleanly, and yaml.safe_load is never reached by the linter that would have complained. Resolved in favour of HEAD, which carries the copyright line and the descriptive comment; the incoming side contributed nothing but the removal of those lines, and the SPDX header it was adding is already present above the marker. Worth noting what this implies: a conflict was resolved by committing the markers, and no check caught it afterwards, because the very file that would have been checked was the one that could not be parsed. Detection is being added upstream: hyperpolymath/standards#582. Co-Authored-By: Claude Fable 5 Signed-off-by: Jonathan D.A. Jewell <6759885+hyperpolymath@users.noreply.github.com> --- .github/workflows/pages.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 22eeb32..5935e1a 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -1,10 +1,7 @@ # SPDX-License-Identifier: MPL-2.0 -<<<<<<< HEAD # Copyright (c) 2026 Jonathan D.A. Jewell (hyperpolymath) # # pages.yml — GitHub Pages deployment via Ddraig SSG. -======= ->>>>>>> 5c04edd (fix(ci): add missing SPDX header to pages.yml) name: GitHub Pages (Ddraig SSG) on: push: