Resolve merge conflicts: keep complete committee report articles, merge main branch content#366
Merged
pethers merged 2 commits intonews-realtime/20260220-1015-25739be69664955ffrom Feb 20, 2026
Conversation
… main branch content Co-authored-by: pethers <[email protected]>
Copilot
AI
changed the title
[WIP] Add committee reports published on 2026-02-20
Resolve merge conflicts: keep complete committee report articles, merge main branch content
Feb 20, 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.
This PR's committee report articles conflicted with main because both branches independently added the same files (nightly generator in #360 produced stub versions; this PR has full breaking-news quality versions).
Resolution
Article files (
news/2026-02-20-committee-reports-*.html, 14 langs) — kept PR branch (ours):article:section: Breaking, correct timestamps (T10:15:00)Index files (
news/index*.html, 14 langs) — took main (theirs) then patched:headline/description/typefields to match our better metadata"type": "analysis"→"type": "breaking"across all 14 language indexesInfrastructure (AGENTS.md, SKILLS.md,
.github/workflows, sitemap.xml) — took main (theirs):Net result
All 2026-02-20 content now present: committee reports (this PR) + government propositions + opposition motions + week-ahead (from main #360).
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.