Skip to content

Sync main into develop - #303

Merged
chaksaray merged 2 commits into
developfrom
chore/sync-main-into-develop
Sep 29, 2026
Merged

chaksaray merged 2 commits into
developfrom
chore/sync-main-into-develop

Conversation

@chaksaray

Copy link
Copy Markdown
Contributor

Summary

  • Merges origin/main into develop. main had one commit develop
    didn't (#301, a squash of AVE-2026-00084 and the AVE-2026-00044
    variant), both of which were already on develop individually via
    #289 and #294.
  • No conflict, unlike prior syncs in this repo's history: git diff origin/develop origin/main was empty before this merge, both
    branches already held byte-identical trees. This merge only
    reconciles the commit graph, not any content divergence.

Test plan

  • python3 scripts/validate_records.py — all 84 records valid
  • python3 scripts/check_fixtures.py — all 84 records have fixtures
  • python3 scripts/write_verification_basis.py — no mismatch
  • pytest tests/ -x -q — 486 passed
  • git diff origin/develop HEAD post-merge — empty, confirming no unintended content change

chaksaray and others added 2 commits September 29, 2026 07:09
…: AVE-2026-00044, new variant instance from Clinejection (#301)

Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: chaksaray <15962335+chaksaray@users.noreply.github.com>
@chaksaray
chaksaray merged commit 8f35a4a into develop Sep 29, 2026
6 checks passed
@chaksaray
chaksaray deleted the chore/sync-main-into-develop branch September 29, 2026 00:26
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.

1 participant