sync: add opposition-motions articles and apply main's robots.txt + script fixes to feature branch#500
Merged
pethers merged 2 commits intonews-realtime/2026-02-24-1030-4fb2b8fdc2e10b86from Feb 24, 2026
Conversation
…ion truncation from main Co-authored-by: pethers <[email protected]>
Copilot
AI
changed the title
[WIP] Add five propositions on civilian defence and psychological violence
sync: add opposition-motions articles and apply main's robots.txt + script fixes to feature branch
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.
The feature branch (
news-realtime/2026-02-24-1030-4fb2b8fdc2e10b86) was missing three sets of changes that landed onmainafter the branch diverged, causing PR #485 to remain dirty.Changes
news/2026-02-24-opposition-motions-*.html— added from main (PR feat(news): Opposition Motions Analysis – 24 February 2026 #483). These files were already referenced in the branch'snews/index*.htmlandsitemap.xmlbut the HTML files themselves were absent.robots.txt— removes staleDisallow: /schemas/that main already dropped.scripts/generate-news-indexes.ts— applies word-boundary description truncation from main's PR fix(ja): localize category/heading, correct article type, fix JSON-LD description truncation #497:Note on remaining conflicts
The
news/index*.html(14 files) andsitemap.xmlin PR #485 will still show git conflicts — both branches independently inserted an article at position 3 from the common ancestor (main→opposition-motions, feature →legislative-push), creating a position-cascade that git's 3-way merge cannot auto-resolve. The content in the feature branch is already correct (opposition-motions at pos 3, legislative-push at pos 4). Manual conflict resolution accepting the feature-branch side for each region is needed when merging PR #485.🔒 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.