fix: resolve merge conflicts by taking main's version for 15 generated output files#509
Merged
pethers merged 2 commits intonews-realtime/2026-02-24-1030-4fb2b8fdc2e10b86from Feb 24, 2026
Conversation
…g files Co-authored-by: pethers <[email protected]>
Copilot
AI
changed the title
[WIP] Update on Sweden's five propositions for civilian defence
fix: resolve merge conflicts by taking main's version for 15 generated output files
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.
This branch had merge conflicts in 15 generated output files (news indexes and sitemap) caused by newer articles being merged into main after this branch was created.
Changes
origin/mainfor all 15 conflicting files:news/index.html+ 13 language variants (_ar,_da,_de,_es,_fi,_fr,_he,_ja,_ko,_nl,_no,_sv,_zh)sitemap.xmlSince these are purely generated output files, main's version is authoritative — the article content files (
news/2026-02-24-legislative-push-*.html) introduced by this branch remain intact.💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.