Rebase a branch onto main

Rebase my branch feature/payment-refactor onto main so the history is linear before the release branch cut on Wednesday. Resolve conflicts, keep my local commits intact, run unit tests, and push the rebased branch to origin with force-with-lease. Tell Diego in frontend when it’s ready for his smoke test.

Before I rebase feature/payment-refactor onto main, surface the risky places: list files that will have conflicts, flag commits that touch public APIs, show any changes to package versions, and warn if there are tests in main that fail locally. That will make it easier for Diego to decide when to run his smoke test.

While rebasing feature/payment-refactor onto main a conflict appeared in the public API file and Diego expects backward compatibility. I’m worried resolving this could break his consumers but I can’t judge whether to accept main or keep my change. What is the likeliest consequence of each choice and what should I do now to keep Diego’s work safe and still finish the rebase before Wednesday?

We repeatedly rebase under deadline pressure and then integration tests fail on staging because compatibility changes weren’t coordinated. What habit changes — in how we communicate API changes, run pre-rebase checks, and record approvals — will reduce broken integrations and make Diego and downstream teams less likely to be surprised?