Merge claude/review-remaining-tasks-FORRM into copilot branch, accepting all incoming changes #3711
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 | Preview, Comment | Mar 30, 2026 8:35pm |
Cross-repo impact
See what breaks downstream if this PR merges.
⮌ Merged
This pull request was merged into main.
c comment · e edit title · m merge · a approve · r request changes · ? shortcuts
Originally written by @Copilot on GitHub.
Imported from https://github.com/ccantynz-alt/Hibiscus-to-airport/pull/36
Merges
claude/review-remaining-tasks-FORRMinto 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
Dockerfile,render.yaml, and allbackend/Python source (FastAPI/Render stack fully retired)About,Contact,Features,Fleet,GeoContent,Header,Hero,HowItWorks,Services,Testimonialsfrontend/src/hooks/useGoogleMaps.jsAdminCreateBooking,AdminEditBookingupdatedBookingPage,HomePageupdatedfrontend/package.json+yarn.lockupdatedCLAUDE.md— updated to reflect current architecture