fix: owasp_mcp audit corrections (39 records) and framework_sources backfill - #264
Merged
Merged
Conversation
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.
Follow-up to #263. After #263 landed PR #256's content on main, PR #260
(develop → main) still showed CONFLICTING. Checked: #260's own original
content (the pin_status "unknown" schema addition) was confirmed already
identical on main via #263 -- the remaining real gap was develop's
further divergence via #259 (the owasp_mcp audit corrections, 39
records), which had never been synced to main at all.
Cherry-picked PR #259's squashed commit (
fef4109) onto a fresh branchoff
main; applied with zero conflicts. A full test-merge ofdevelopinto this branch afterward showed only a trivial
dist/manifesttimestamp conflict (from #258, itself just a regeneration byproduct of
#259) -- no substantive divergence remains.
Once this merges, #260 is fully superseded (both of its real content
sources, #256 and #259, will be on main via #263 and this PR) and can be
closed rather than re-resolved directly.
Validated:
python scripts/validate_records.py(80/80 valid),python scripts/check_fixtures.py(all pass),pytest tests/ -x -q(463 passed).