sync: resolve merge conflicts — rebase legislative-push branch onto main#505
Merged
pethers merged 2 commits intonews-realtime/2026-02-24-1030-4fb2b8fdc2e10b86from Feb 24, 2026
Merged
Conversation
…ap, and news-articles.json Co-authored-by: pethers <[email protected]>
Copilot
AI
changed the title
[WIP] Add five propositions on civilian defence and psychological violence
sync: resolve merge conflicts — rebase legislative-push branch onto main
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 was behind main by two merged articles (opposition-motions, welfare-reform-proposition), causing conflicts across all 16 files.
Resolution
data/news-articles.json— took main's 682-article version, inserted 14 legislative-push entries after welfare-reform block → 696 totalindex.html,index_*.html) — took main's versions, injected legislative-push asposition: 4ListItem in JSON-LD, shifted welfare-reform and subsequent positions up by 1, incrementednumberOfItemssitemap.xml— took main's version, inserted 14 legislative-push<url>blocks before the welfare-reform entries (14 735 → 15 030 lines)robots.txt— took main's version (no changes from this branch)🔒 GitHub Advanced Security automatically protects Copilot coding agent pull requests. You can protect all pull requests by enabling Advanced Security for your repositories. Learn more about Advanced Security.