Merge main: resolve 28 add/add and content conflicts, keep better committee reports#367
Merged
pethers merged 18 commits intonews-realtime/20260220-1015-25739be69664955ffrom Feb 20, 2026
Merged
Conversation
Generate 56 articles (4 types × 14 languages) for Friday 2026-02-20. Co-authored-by: Copilot <[email protected]>
Regenerate all 14 language news indexes and update generation metadata. Co-authored-by: Copilot <[email protected]>
…-ahead articles with real parliamentary data Co-authored-by: pethers <[email protected]>
Co-authored-by: pethers <[email protected]>
…e week-ahead articles Co-authored-by: pethers <[email protected]>
…ions.md with architecture docs requirements Co-authored-by: pethers <[email protected]>
…ojibake, Danish Folketing→Riksdag Co-authored-by: pethers <[email protected]>
Fix duplicate keywords, type field inconsistency, and enhance week-ahead articles with real parliamentary data
…date AGENTS.md (14 agents) and SKILLS.md (87 skills) Co-authored-by: pethers <[email protected]>
…-20-7b18c38f01a37a6d 📰 Automated News Generation - 2026-02-20
… categories in AGENTS.md Co-authored-by: pethers <[email protected]>
…nd-skills Add 18 skills from Hack23 repos, update copilot-instructions.md, AGENTS.md, and SKILLS.md
…, update generation timestamp Co-authored-by: pethers <[email protected]>
Copilot
AI
changed the title
[WIP] Break: Publish ten committee reports from Riksdagen
Merge main: resolve 28 add/add and content conflicts, keep better committee reports
Feb 20, 2026
pethers
merged commit 7a05f04
into
news-realtime/20260220-1015-25739be69664955f
4 checks passed
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.
Both branches independently created the 14
news/2026-02-20-committee-reports-*.htmlfiles with incompatible content, plus 14 index files had diverging metadata — blocking the PR merge.Resolution
both added): kept this branch's versions — 8 specific topic H2 sections (Nuclear, Wind, Welfare, Competition, Rural, Labour Market, Opposition, Cultural Heritage) vs main's 2 generic sectionscontent conflict): kept our metadata — specific headline,"type": "breaking", detailed excerpt vs main's generic equivalents8f35975): usedgit merge -X ours origin/mainto produce a proper two-parent commit, formally includingda98e4a(main HEAD) in this branch's ancestrynews/metadata/last-generation.json: updatedlastGenerationtimestamp to2026-02-20T10:15:00Zto match realtime generationResult:
git merge-treereports 0 conflicts — branch merges cleanly into main.✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.