fix: resolve merge conflicts — take main as base + restore legislative-push articles#511
Merged
pethers merged 2 commits intonews-realtime/2026-02-24-1030-4fb2b8fdc2e10b86from Feb 24, 2026
Conversation
…articles Co-authored-by: pethers <[email protected]>
Copilot
AI
changed the title
[WIP] Add Sweden's five propositions on civilian defence and violence
fix: resolve merge conflicts — take main as base + restore legislative-push articles
Feb 24, 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
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.
Branch had diverged from
mainacross 18 files after multiple articles merged. Conflicts in all 14 news index files,sitemap.xml,data/news-articles.json,news/metadata/last-generation.json, andscripts/generate-news-indexes.ts.Strategy
Take
mainas the authoritative base for all conflicting generated files, then re-apply thelegislative-pusharticle data from this branch on top.Changes
News index files (
news/index*.html× 14)ItemListwith correctListItem → NewsArticlenesting (fixes malformed structured data flagged in review)articlesarray with"type": "breaking"sitemap.xmlhreflanglinks for all 14 languagesevening-analysisand all other article groups present in maindata/news-articles.jsonnews/metadata/last-generation.jsonlegislative-push+welfare-reform-proposition)scripts/generate-news-indexes.ts+ newscripts/generate-news-indexes/constants,helpers,index,template,types) matching main's decomposed architecture💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.