chore(licence): normalise to MPL-2.0 (code) + CC-BY-SA-4.0 (docs) - #38
Merged
Conversation
- LICENSES/ = {MPL-2.0.txt, CC-BY-SA-4.0.txt}; root LICENSE = verbatim MPL-2.0 (GitHub display)
- SPDX: code -> MPL-2.0, docs (.md/.adoc) -> CC-BY-SA-4.0; metadata/badge fixes; vendored untouched
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
hyperpolymath
enabled auto-merge (squash)
August 24, 2026 22:42
Resolves 11 conflicts. The branch dates from 2026-06-24; main has since
renamed the docs to AsciiDoc and removed all ReScript, so most conflicts
were the branch editing files that no longer exist.
Resolution, by class:
* 4x modify/delete on .md (CHANGELOG, CODE_OF_CONDUCT, SECURITY,
docs/tech-debt-2026-05-26) -- main renamed each to .adoc. Accepted
main's deletion, and PORTED THIS PR'S PURPOSE onto the surviving
.adoc files, which carried no SPDX header. Deleting alone would have
discarded the licence normalisation this PR exists to do.
* 4x modify/delete on .res (Deno x2, Resilience, bindings/Deno) --
main deleted all ReScript; the repo now has zero .res files, and
ReScript is banned by LANGUAGE-POLICY.adoc S3 (uncontested).
Accepted main's deletion; the branch was only adding licence
headers to files that should not exist.
* 2x add/add on LICENSES/*.txt -- differences were trailing whitespace
and http:// vs https://. Took main's canonical text verbatim rather
than hand-mixing; a licence text is taken whole from one side, never
merged hunk by hunk.
* 1x content conflict on CONTRIBUTING.adoc -- kept the branch's SPDX
header and `= Contributing Guide` document title, then main's
content. Main's version began with `== Clone the repository`, a
section header with no document title, which is malformed AsciiDoc.
SPDX headers follow the repo's existing AsciiDoc convention (`//` line
comments), matched from README.adoc / MAINTAINERS.adoc / ROADMAP.adoc.
Verified: zero unresolved paths; no conflict markers anywhere in the
tree; both LICENSES byte-identical to main; no deleted path still
present on main.
Co-Authored-By: Claude Opus 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
Closes #
Type of change
How has this been verified?
Checklist
git commit -S).SPDX-License-Identifier(code/configMPL-2.0,prose
CC-BY-SA-4.0); I did not relicense existing files.Notes for reviewers