Sync main into develop, resolves PR #238's conflict - #239
Merged
Conversation
Co-authored-by: chaksaray <15962335+chaksaray@users.noreply.github.com>
Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: chaksaray <15962335+chaksaray@users.noreply.github.com>
(#229) Co-authored-by: Nicolai <245527909+predictor2718@users.noreply.github.com>
main advanced by PR #237 (external_authority applied to AVE-2026-00074, issue #218 -- previously merged straight to main via #220 rather than through develop). develop already carried this content (via #220's earlier merge into develop) plus everything else main has, so this merge is otherwise a no-op except for the recurring dist/ave-records-latest.manifest.json generated_at collision. Resolved by keeping develop's later generated_at timestamp, then regenerating dist/ fresh via scripts/build-records.js rather than trusting the text merge. Validated: - python3 scripts/validate_records.py: 80/80 valid (only pre-existing unrelated researcher-attribution warnings) - python3 scripts/check_fixtures.py: all pass - python3 -m pytest tests/ -x -q: 435 passed
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.
PR #238 (develop → main) is DIRTY/CONFLICTING.
mainadvanced by PR #237 (external_authority applied to AVE-2026-00074, issue #218) — this landed straight onmainvia #220 rather than throughdevelopfirst, same anti-pattern flagged when #220 was still open.developalready carried this exact content (from #220's earlier merge intodevelop) plus everything elsemainhas, so this merge is otherwise a no-op except for the recurringdist/ave-records-latest.manifest.jsongenerated_atcollision — confirmed via a clean local test-merge, only one file conflicted.Resolved by keeping develop's later
generated_at, then regeneratingdist/fresh vianode scripts/build-records.jsrather than trusting the text merge.Validated:
python3 scripts/validate_records.py: 80/80 valid (only pre-existing, unrelated researcher-attribution warnings)python3 scripts/check_fixtures.py: all passpython3 -m pytest tests/ -x -q: 435 passedRequesting squash-merge, matching the established pattern for these sync PRs (#206, #209, #210, #212, #226, #227).