Resolve merge conflicts for PRs #95 and #96 by rebasing onto restructured sidebar

[Copilot]

PRs #95 (GO Feature Flag) and #96 (SurrealDB) from David Bottiau (@Odonno) had conflicts due to sidebar.topics.ts being moved from src/frontend/ to src/frontend/config/sidebar/ in commit 0fbe528.

Changes

Created clean rebased branches:

• rebase-pr-95-goff - GO Feature Flag integration
• rebase-pr-96-surrealdb - SurrealDB integration

PR #95 - GO Feature Flag:

• Added src/frontend/src/assets/icons/go-feature-flag.png
• Added src/frontend/src/content/docs/integrations/devtools/goff.mdx (184 lines)
• Updated IntegrationGrid.astro to register goff icon
• Added goff entry to config/sidebar/sidebar.topics.ts (devtools section)
• Added mapping to integration-docs.json

PR #96 - SurrealDB:

• Added src/frontend/src/content/docs/integrations/databases/surrealdb.mdx (254 lines)
• Added SurrealDB entry to config/sidebar/sidebar.topics.ts (databases section)

Usage

Original author can force-push rebased branches:

git fetch https://github.com/microsoft/aspire.dev rebase-pr-95-goff
git checkout goff && git reset --hard FETCH_HEAD && git push --force

git fetch https://github.com/microsoft/aspire.dev rebase-pr-96-surrealdb
git checkout surrealdb && git reset --hard FETCH_HEAD && git push --force

Or maintainers can merge individual branches or this combined PR directly.

See MERGE_CONFLICT_RESOLUTION.md for technical details.

Warning

Firewall rules blocked me from connecting to one or more addresses (expand for details)

I tried to connect to the following addresses, but was blocked by firewall rules:

• https://api.github.com/repos/CommunityToolkit/Aspire
  • Triggering command: /usr/local/bin/node node ./scripts/update-github-stats.js (http block)
• https://api.github.com/repos/dotnet/aspire
  • Triggering command: /usr/local/bin/node node ./scripts/update-github-stats.js (http block)
• https://api.github.com/repos/dotnet/aspire-samples
  • Triggering command: /usr/local/bin/node node ./scripts/update-github-stats.js (http block)
• https://api.github.com/repos/microsoft/aspire.dev
  • Triggering command: /usr/local/bin/node node ./scripts/update-github-stats.js (http block)

If you need me to access, download, or install something from one of these locations, you can either:

• Configure Actions setup steps to set up my environment, which run before the firewall is enabled
• Add the appropriate URLs or hosts to the custom allowlist in this repository's Copilot coding agent settings (admins only)

Original prompt

Both PRs #95 and #96 need to be rebased from main to resolve the merge conflicts, to help the op, please create a PR to resolve these merge conflicts in their branch.

---

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