merge: resolve persistent conflicts with main — add welfare-reform articles alongside legislative-push#508
Merged
pethers merged 2 commits intonews-realtime/2026-02-24-1030-4fb2b8fdc2e10b86from Feb 24, 2026
Conversation
…p legislative-push Co-authored-by: pethers <[email protected]>
Copilot
AI
changed the title
[WIP] Add five propositions on civilian defence and psychological violence
merge: resolve persistent conflicts with main — add welfare-reform articles alongside legislative-push
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.
Previous resolution attempts created cascading sub-PRs instead of resolving conflicts directly in this branch. The branch was missing 14 welfare-reform article files that main gained via PR #501, causing repeated unsolvable conflicts in all index files,
data/news-articles.json,sitemap.xml, andlast-generation.json.Changes
git merge origin/maindirectly, resolving all 17 conflicting files in-place rather than via sub-PRsorigin/mainnews/index*.html): Kept HEAD's version — legislative-push at position 4, welfare-reform shifted to position 5,numberOfItemscorrect (60/50/49 per language)data/news-articles.json: 696 articles (682 from main + 14 legislative-push entries)sitemap.xml: Both article sets present — 224 legislative-push URLs + 224 welfare-reform URLsnews/metadata/last-generation.json: Merged to new structured format listing both article sets (generated: 28)Branch now diverges from
mainonly by the legislative-push article content this PR is meant to add.💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.