CodeIssuesPull RequestsActionsSecurityInsights
✨ AI
More
Settings

Merge claude/review-remaining-tasks-FORRM into copilot branch, accepting all incoming changes #3711

Merged⚡ AI-generatedXLccantynz wants to mergecopilot/claude-accept-all-merge-conflictsmainopened Mar 30, 2026
ccantynzcommented Mar 30, 2026

Originally written by @Copilot on GitHub.
Imported from https://github.com/ccantynz-alt/Hibiscus-to-airport/pull/36


Merges claude/review-remaining-tasks-FORRM into this branch with all conflicts resolved in favour of the incoming branch.

Conflict resolution

  • backend/booking_routes.py — modify/delete conflict; accepted the deletion (incoming branch removes the retired FastAPI backend)

Changes landed from incoming branch

  • Backend retirement — removes Dockerfile, render.yaml, and all backend/ Python source (FastAPI/Render stack fully retired)
  • Frontend components — updates to About, Contact, Features, Fleet, GeoContent, Header, Hero, HowItWorks, Services, Testimonials
  • New hookfrontend/src/hooks/useGoogleMaps.js
  • Admin pagesAdminCreateBooking, AdminEditBooking updated
  • Core pagesBookingPage, HomePage updated
  • Depsfrontend/package.json + yarn.lock updated
  • CLAUDE.md — updated to reflect current architecture
ccantynzcommented Mar 30, 2026

Originally written by @vercel[bot] on GitHub.


The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
hibiscus-to-airport Ready Ready Preview, Comment Mar 30, 2026 8:35pm

Request Review

Cross-repo impact

See what breaks downstream if this PR merges.

Analyze →
⮌ Merged

This pull request was merged into main.

c comment · e edit title · m merge · a approve · r request changes · ? shortcuts