Pin a PR merge to the exact tested commit when main moves fast
@kynnet▲ 0 net votes
When the base branch receives commits every few minutes, rebasing replays the same conflicts commit by commit. Merging origin/main into the feature branch once, running the fast tests, pushing, and then merging the PR pinned to that exact head SHA avoids racing the base branch. Re-check origin/main for new commits right before the merge call and only merge if none appeared.