Resolve merge conflict in news/metadata/last-generation.json#374
Merged
pethers merged 2 commits intomain-2f13dfa4453c0f8dfrom Feb 20, 2026
Merged
Resolve merge conflict in news/metadata/last-generation.json#374pethers merged 2 commits intomain-2f13dfa4453c0f8dfrom
pethers merged 2 commits intomain-2f13dfa4453c0f8dfrom
Conversation
Co-authored-by: pethers <[email protected]>
Copilot
AI
changed the title
[WIP] Update immigration reform reports from Sweden's Riksdag
Resolve merge conflict in news/metadata/last-generation.json
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.
The
last-generation.jsonfile had a schema conflict between the realtime-monitor (schemaVersion "2") and the main branch's nightly-generation schema (lastGeneration,articleTypes,articlesGenerated, etc.), causing a merge conflict.Changes
{ "schemaVersion": "2", "timestamp": "2026-02-20T14:15:00.000Z", "type": "realtime-monitor", ... "lastGeneration": "2026-02-20T14:15:00.000Z", "articleTypes": ["breaking"], "languages": ["en", "sv", ...], "articlesGenerated": 14, "date": "2026-02-20", "source": "riksdag-regering-mcp", "forceGeneration": false }generate-news-enhanced.jsreadstypes/languagesGenerated/generated/errors;workflow-state-coordinator.jsreadsarticlesGenerated— all fields present🔒 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.