Commit 732d448
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
- .claude
- .github
- ISSUE_TEMPLATE
- copilot
- workflows
- .machine_readable
- 6a2
- anchor
- agent_instructions
- svc
- k9
- Src/Abi
- benches
- contractiles
- docs
- accessibility
- compliance
- ffi/zig
- src
- test
- fuzz/fuzz_targets
- src
- arbiter
- lib/conative_gating
- contract/src
- oracle/src
- slm/src
- tests
- training
- violations
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
1 | 5 | | |
2 | 6 | | |
3 | 7 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | 1 | | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | 2 | | |
7 | 3 | | |
8 | 4 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
1 | 5 | | |
2 | 6 | | |
3 | 7 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
1 | 5 | | |
2 | 6 | | |
3 | 7 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
1 | 5 | | |
2 | 6 | | |
3 | 7 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
1 | 5 | | |
2 | 6 | | |
3 | 7 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
1 | 5 | | |
2 | 6 | | |
3 | 7 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | 1 | | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | 2 | | |
7 | 3 | | |
8 | 4 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | 1 | | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | 2 | | |
7 | 3 | | |
8 | 4 | | |
| |||
0 commit comments