Sync main into develop, resolves PR #222's conflict - #226
Merged
Conversation
Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: chaksaray <15962335+chaksaray@users.noreply.github.com>
Co-authored-by: Nicolai <245527909+predictor2718@users.noreply.github.com> Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: chaksaray <15962335+chaksaray@users.noreply.github.com> Co-authored-by: Sankalp Gilda <sankalp.gilda@gmail.com>
… (#214) Signed-off-by: Sankalp Gilda <sankalp.gilda@gmail.com> Co-authored-by: CHAK Saray <chaksaray@gmail.com>
Resolves the conflict on PR #222 (develop -> main). This one differs from the prior recurring last_updated-only conflicts: main had received the full issue #98 feature (verification_basis derivation, evidence_vantage/evidence_method axes, the external_authority evidence engine, check_confidence_signal.py, write_verification_basis.py, and their schema/test additions) via #213/#214, none of which had been synced into develop yet. Two real conflicts: - dist/ave-records-latest.manifest.json: the usual generated_at timestamp collision. Kept the later of the two (main's, this time -- main had a more recent build than develop). - tests/test_validate_data.py: not a genuine disagreement -- develop's side was empty at this location, main's side added ~170 lines of new tests for the #98 feature. Kept main's additions in full. Everything else (schema/ave-record-1.1.0.schema.json, scripts/validate_records.py, the two new scripts, the two new test files, the two new guide docs) auto-merged cleanly with no conflict markers, confirmed before touching anything. dist/ regenerated fresh via scripts/build-records.js rather than trusting the text merge. All 80 records still validate against the updated schema (the new fields are optional), fixtures intact, full suite (427 tests, up from 342 -- confirming the new #98 test suites landed and pass) succeeds.
This was referenced Aug 29, 2026
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
3 participants
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.
Resolves the conflict on PR #222 (develop → main). Different in kind from the prior recurring
last_updated-only conflicts (#206/#209/#210): main had received the full issue #98 feature (verification_basisderivation,evidence_vantage/evidence_methodaxes, theexternal_authorityevidence engine,check_confidence_signal.py,write_verification_basis.py, and their schema/test additions) via #213/#214, none of which had made it into develop yet.Two real conflicts:
dist/ave-records-latest.manifest.json: the usualgenerated_attimestamp collision. Kept the later of the two — main's, this time, since main had the more recent build.tests/test_validate_data.py: not a genuine disagreement — develop's side was empty at this location; main's side added ~170 lines of new tests for the Design question: confidence_baseline is self-reported, no structural verification #98 feature. Kept main's additions in full.Everything else (
schema/ave-record-1.1.0.schema.json,scripts/validate_records.py, the two new scripts, the two new test files, the two new guide docs) auto-merged cleanly with no conflict markers — confirmed viagit statusbefore touching anything, not assumed.dist/regenerated fresh viascripts/build-records.jsrather than trusting the text merge.Validated: all 80 records still validate against the updated schema (the new fields are optional), fixtures intact, full suite passes — 427 tests, up from 342, confirming the new #98 test suites actually landed and pass, not just that nothing broke.
Please squash-merge, same as every prior sync PR — linear history required on develop.