Push commits to remote

I finished work on feature/token-rotation. Push my local branch feature/token-rotation to the remote as a new branch on origin, set upstream so future pushes are simple, and then push tags v1.2.0 and v1.2.0-rc1. Fail if the push would overwrite remote history. After pushing, open a pull request targeting main and assign Priya Shah as reviewer.

Before I push this branch, make it easy for ops and reviewers to accept it. Run a dry-run push to detect conflicts, ensure commit messages follow the project's convention, squash trivial fixup commits if appropriate, and surface any large binary blobs or inadvertent secrets in the pushed commits. If anything suspicious appears, list the exact commits to rewrite or remove.

I tried to push feature/token-rotation and the remote rejected it because origin/main moved ahead. I haven't pulled since starting work and I'm worried merging will break the integration tests that pass locally. What is the safest sequence to reconcile my branch with origin/main, preserve my work, and minimize the chance of introducing regressions after push?

I keep getting rejected pushes because I work off an old main and forget to pull or rebase, which creates painful merge commits and broken CI. What workflow change should I adopt so I stay in sync with origin/main, reduce push conflicts, and keep history clean while collaborating with multiple teammates?