fix: resolve merge conflicts between copilot/sub-pr-433 and main#445
Merged
pethers merged 14 commits intonews-generation/weekly-review-2026-02-22-25732d3df5a3d00ffrom Feb 22, 2026
Merged
Conversation
- Extra budget amendment (Prop 2025/26:143) for Ukraine air defense & vaccine preparedness - New emergency food supply chain reserves law - Context: Week of unprecedented legislative intensity (AI strategy, criminal justice, immigration reform) - 14 language versions (en, sv, da, no, fi, de, fr, es, nl, ar, he, ja, ko, zh) - Updated news indexes, metadata, and sitemap Sources: riksdag-regering-mcp (data.riksdagen.se, g0v.se) Co-authored-by: Copilot <[email protected]>
…s all 14 language indexes Co-authored-by: pethers <[email protected]>
Fix inconsistent article type classification for weekend articles across all 14 language indexes
…nd-security-preparedness Co-authored-by: pethers <[email protected]>
Fix weekend-analysis article type, localized back-to-news links, and excerpt truncation
…analysis-751b87f663d6aa99 📰 Weekend Analysis: Sweden Bolsters Security on Three Fronts — 2026-02-22
…rom both branches Co-authored-by: pethers <[email protected]>
…ete article set Co-authored-by: pethers <[email protected]>
Co-authored-by: pethers <[email protected]>
Copilot
AI
changed the title
[WIP] Add weekly review of parliamentary activity for February 15-22 2026
fix: resolve merge conflicts between copilot/sub-pr-433 and main
Feb 22, 2026
pethers
merged commit 1fa51d4
into
news-generation/weekly-review-2026-02-22-25732d3df5a3d00f
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 diverged from
mainafter PR #436 (weekend-security-preparedness) merged independently. Both branches modified the same generated files (data/news-articles.json,news/index*.html×14,sitemap.xml,last-generation.json), causing 17-file conflict.Resolution
origin/mainand checked out its versions of all conflicting files as the baseextract-news-metadata.ts,generate-news-indexes.ts, andgenerate-sitemap.ts— producing a unified set from all articles present innews/(which already contained both weekly-review ×14 and weekend-security-preparedness ×14)origin/mainwith-X oursto create a proper merge commit bringing in main's non-conflicting changes (workflow lock file recompiles,generate-news-indexes.tsfix) while keeping our complete generated filesFinal state
data/news-articles.jsonnews/index*.htmlsitemap.xmlgit merge origin/mainnow returns "Already up to date."💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.