Skip to content

Comments

Merge main branch - resolve sitemap.xml timestamp conflicts#268

Merged
pethers merged 2 commits intomain-833cee879f04323efrom
copilot/sub-pr-265
Feb 17, 2026
Merged

Merge main branch - resolve sitemap.xml timestamp conflicts#268
pethers merged 2 commits intomain-833cee879f04323efrom
copilot/sub-pr-265

Conversation

Copy link
Contributor

Copilot AI commented Feb 17, 2026

Syncs copilot/sub-pr-265 with main branch, resolving conflicts in sitemap.xml caused by concurrent timestamp updates.

Changes

  • Conflict Resolution: Retained newer timestamps (17:27:45.793Z) from feature branch over older main branch timestamps (17:26:43.193Z) in sitemap.xml
  • Merged Updates: Incorporated workflow configuration changes from main:
    • .github/workflows/compile-agentic-workflows.yml
    • .github/workflows/jsdoc-validation.yml
    • api/ JSDoc documentation files

Context

Both branches independently regenerated sitemap.xml with different timestamps. The feature branch timestamps are ~80 seconds newer, reflecting the most recent site state.

<!-- Main branch -->
<lastmod>2026-02-17T17:26:43.193Z</lastmod>

<!-- Feature branch (kept) -->
<lastmod>2026-02-17T17:27:45.793Z</lastmod>

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

Copilot AI changed the title [WIP] Add automated news generation for multiple article types Merge main branch - resolve sitemap.xml timestamp conflicts Feb 17, 2026
Copilot AI requested a review from pethers February 17, 2026 21:18
@pethers pethers marked this pull request as ready for review February 17, 2026 21:18
@pethers pethers merged commit 8a8e185 into main-833cee879f04323e Feb 17, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants