Skip to content

Commit 732d448

Browse files
committed
chore: resolve parent-repo-sync merge conflicts + land sync payload
The 2026-04-XX 'sync from parent repo automation' (commit 1637fa5) left the working tree dirty with 13 unresolved conflict markers. Resolving them unblocks landing the full sync payload (84 files). Resolutions: - 8 empty-vs-empty conflicts: removed markers (no content lost). - 2 identical-content SPDX conflicts (README.adoc:314, DIRECTORY_STRUCTURE.adoc:92): removed markers. - 4 workflow SPDX conflicts (.github/workflows/{ci,language-guard,instant-sync}.yml, .github/FUNDING.yml): kept HEAD (canonical 'MPL-2.0', not '-or-later'). - README.adoc badge conflict: kept incoming (clean MPL_2.0 badge; HEAD had broken 'MPL_2.0--1.0' string). Sync payload (already authored, just unblocked): - LICENSE: pure MPL-2.0 text (replaces prior Palimpsest/MPL dual-license framing). - Copyright lines normalised to the literal Owner format expected by .git/hooks/pre-commit ('Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>'). - New .machine_readable/6a2/ canonical metadata (STATE/META/ECOSYSTEM/AGENTIC/NEUROSYM/PLAYBOOK/0-AI-MANIFEST + README + anchor/). - New .github/copilot/coding-agent.yml. - Old .machine_readable/anchors/ANCHOR.a2ml superseded by .machine_readable/6a2/anchor/.
1 parent 9f56e19 commit 732d448

89 files changed

Lines changed: 380 additions & 188 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.claude/CLAUDE.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
<!--
2+
SPDX-License-Identifier: MPL-2.0
3+
Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
4+
-->
15
## Machine-Readable Artefacts
26

37
The following files in `.machine_readable/` contain structured project metadata:

.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-or-later
5-
>>>>>>> 1637fa5 (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/ISSUE_TEMPLATE/bug_report.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
<!--
2+
SPDX-License-Identifier: MPL-2.0
3+
Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
4+
-->
15
---
26
name: Bug report
37
about: Create a report to help us improve

.github/ISSUE_TEMPLATE/custom.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
<!--
2+
SPDX-License-Identifier: MPL-2.0
3+
Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
4+
-->
15
---
26
name: Custom issue template
37
about: Describe this issue template's purpose here.

.github/ISSUE_TEMPLATE/documentation.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
<!--
2+
SPDX-License-Identifier: MPL-2.0
3+
Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
4+
-->
15
---
26
name: Documentation
37
about: Report unclear, missing, or incorrect documentation

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
<!--
2+
SPDX-License-Identifier: MPL-2.0
3+
Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
4+
-->
15
---
26
name: Feature request
37
about: Suggest an idea for this project

.github/ISSUE_TEMPLATE/question.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
<!--
2+
SPDX-License-Identifier: MPL-2.0
3+
Copyright (c) Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>
4+
-->
15
---
26
name: Question
37
about: Ask a question about usage or behaviour

.github/copilot/coding-agent.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
mcp_servers:
2+
boj-server:
3+
command: npx
4+
args: ["-y", "@hyperpolymath/boj-server@latest"]
5+
env:
6+
BOJ_URL: http://localhost:7700

.github/workflows/ci.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-or-later
5-
>>>>>>> 1637fa5 (chore: sync from parent repo automation)
62
name: CI
73

84
on:

.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-or-later
5-
>>>>>>> 1637fa5 (chore: sync from parent repo automation)
62
# Instant Forge Sync - Triggers propagation to all forges on push/release
73
name: Instant Sync
84

0 commit comments

Comments
 (0)