Pull requests occasionally fall behind main. Use this workflow to bring your branch up to date without polluting the history.
git fetch origin
git checkout <feature-branch>
git rebase origin/main # fix conflicts as they appear
git push --force-with-lease
Only use GitHub’s web editor for quick documentation fixes when the conflict is trivial. For anything more involved, resolve locally with the steps above.
When committing your fixes, follow this message pattern:
fix: resolve merge conflicts with main
Avoid git merge main; rebasing keeps the history linear and reduces noise for reviewers and CI.
For update.yml to refresh the data automatically, GitHub Actions must be allowed to open pull requests. Enable this under Settings ▸ Actions ▸ General ▸ Workflow permissions by checking “Allow GitHub Actions to create pull requests.” If you plan to let the bot auto-merge its PRs, also check “Allow GitHub Actions to approve pull requests.” Ensure branch protection rules still require status checks to pass.
needs-rebase label to your pull request./rebase on the PR.<original>-rebased for review.If a forbidden word appears legitimately (for example in a snapshot or test),
add a regex to regression_allowlist.yml. You can try a pattern locally with:
python scripts/regression_check.py --add-allow "<regex>"
Commit the updated allowlist so future runs pass.