Rebase a branch onto main

The feature branch is four commits ahead of main and conflicts in two files. Rebase the branch onto main, resolve the conflicts in the test helpers and README, run the full test suite locally, and push the rebased commits, keeping the original author and commit messages intact.

Before I rebase this feature branch onto main, make it easy to finish cleanly: show which files will conflict, provide suggested conflict resolutions for the test helper and CI config, list the exact git commands to perform the rebase while preserving author metadata, and remind me which checks to run locally before pushing.

I started rebasing Jordan’s branch onto main and hit conflicts in the CI config and a shared test helper. Jordan expects to keep his tests but isn’t available to weigh in. I’m worried resolving this wrong will change test behavior or break CI. What likely caused these conflicts and what is the best next move to resolve them safely without Jordan?

Our team spends a lot of time rebasing feature branches because main moves fast and many PRs touch shared test helpers and CI configs. I coordinate merges. Where are we losing time and momentum, and which single change to our branching or review process would reduce frequent rebases and conflicts?