Skip to content

docs: retire strict_provenance and drop provenance terminology (re-merge of #199)#201

Merged
dimitri-yatsenko merged 1 commit into
mainfrom
fix/retire-provenance-remerge
Jul 15, 2026
Merged

docs: retire strict_provenance and drop provenance terminology (re-merge of #199)#201
dimitri-yatsenko merged 1 commit into
mainfrom
fix/retire-provenance-remerge

Conversation

@dimitri-yatsenko

Copy link
Copy Markdown
Member

Corrective re-merge of #199, which shows as merged but never landed on main.

What happened

#198 and #199 were merged within seconds of each other. #199 (stacked on #198) was squash-merged against a stale base — a snapshot of main from before #198 had propagated — so its squash commit (652f5cc2) parented a pre-#198 commit. GitHub marked the PR merged but could not fast-forward main (already advanced to #198) to it, so the ref never moved. Net result: main still had provenance.md, no trace.md, and none of the terminology sweep — a merge-race artifact, not a content problem.

This PR

Re-applies exactly #199's 16-file change set on top of the current main (which now includes #198): deletes provenance.md, adds trace.md, sweeps the terminology across the conceptual pages, and wires the redirect. #198's files (autopopulate.md, computation-model.md) are intentionally not touched — they are already on main.

Content is identical to the approved #199 (reviewed and approved by @MilagrosMarin). The PR-body overclaim about dj-platform.svg from #199 is carried over as corrected: the sole remaining provenance occurrence under src/ is the platform-architecture label in images/dj-platform.svg, intentionally kept (it describes the DataJoint platform, which builds provenance capabilities; the framework docs describe the open-source core’s relational workflow model, where "lineage" is apt).

Diff: 16 files, +341 / −496 — matches #199 exactly.

Re-applies the changes from #199, which was marked merged but never landed on
main: #198 and #199 were merged seconds apart, and #199's squash was computed
against a stale base (main before #198 propagated), so GitHub could not advance
main to it and the retire-provenance changes were silently dropped. This branch
re-applies exactly #199's 16-file change set on top of the current main (which
now includes #198): deletes provenance.md, adds trace.md, and completes the
terminology sweep.
@dimitri-yatsenko dimitri-yatsenko merged commit 9738acb into main Jul 15, 2026
3 checks passed
@dimitri-yatsenko dimitri-yatsenko deleted the fix/retire-provenance-remerge branch July 15, 2026 15:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants