Sync main into develop, resolves PR #187's conflict - #189
Merged
Merged
Conversation
…#186) Co-authored-by: chaksaray <15962335+chaksaray@users.noreply.github.com>
# Conflicts: # dist/ave-records-latest.manifest.json
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.
Summary
PR #187 (`develop` → `main`, the standard promotion PR) is showing
`CONFLICTING`/`DIRTY`. Root cause: `main` has one commit not yet on
`develop` -- `49e4691` (PR #186, "research: AVE → OpenCRE pilot
mapping (Batch 1 submitted, issue open)") -- which independently landed
the same OpenCRE pilot files and the AVE-2026-00070 researcher fix that
had already reached `develop` separately via PR #185 and PR #182. Same
underlying content, different commit history on each branch -- a
divergence conflict, not a real content conflict.
Confirmed by merging locally: only one actual conflict, in the
generated `dist/ave-records-latest.manifest.json` (record count /
timestamp), same as every prior instance of this exact conflict shape
in this repo. Resolved by regenerating via the canonical
`scripts/build-records.js` rather than hand-editing -- `dist/ave-records-latest.json`
itself came out byte-identical after rebuild, confirming the two
branches' actual record content already agreed.
Note on process
Learned from resolving PR #181's identical-shaped conflict earlier:
this repo's `develop` branch protection rejects direct pushes and
merge commits pushed straight to the branch ref. Did not repeat that
mistake here -- this is a normal PR into `develop`, for a human to
merge through GitHub's UI, not a direct push.
Checklist
hand-edited