Commit often, then interactive rebase, then push to GitHub. Then code review happens, and any comments get addressed with some extra commits. The annoying thin

Commit often, then interactive rebase, then push to GitHub. Then code review happens, and any comments get addressed with some extra commits. The annoying thing is that often someone will change CI for some unrelated subsystem (we're in a monorepo) and the way to fix that is "merge master into your branch". Of course I could rebase on top of master before pushing, and I do, but that doesn't work well if the CI change happens while my PR is in review. Then I have to merge master into the PR branch, since people do check branches out to review them sometimes. Thankfully we squash PRs before merge, so it only ends up with a single commit in Master, but it does mean there's sometimes an intermediate mess.