Sync main into develop, resolves PR #222's conflict (round 2) - #227
Merged
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>
main advanced by one Dependabot commit (#223, codeql-action bump) since the last sync (#226), which re-triggered the recurring dist/ave-records-latest.manifest.json generated_at collision between develop and main. 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: 427 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
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.
PR #226 synced main into develop and closed PR #222's conflict, but main advanced one more commit (#223, Dependabot codeql-action bump) before #222 could be reviewed/merged. That re-triggered the same recurring
dist/ave-records-latest.manifest.jsongenerated_attimestamp collision betweendevelopandmain— no other conflicts this time, confirmed via a clean auto-merge on everything else.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: 427 passedRequesting squash-merge, matching the established pattern for these sync PRs (#206, #209, #210, #212, #226).
Once this lands, PR #222 (develop → main) should go clean again — but note #220 is still open targeting
maindirectly rather thandevelop; if it merges before #222, this same conflict will resurface a third time.