This is an automated email from the ASF dual-hosted git repository. github-merge-queue[bot] pushed a commit to branch gh-readonly-queue/main/pr-6171-29adcffcf32d7bd135c09187d2569891e9dbc25b in repository https://gitbox.apache.org/repos/asf/datafusion-comet.git
commit 29d5d4f939bd340ab7107bcf6d7ca00f541e8dfe Author: YuLun Mao <[email protected]> AuthorDate: Thu Sep 24 09:28:33 2026 +0000 chore: recommend --force-with-lease when updating PR branches (#6171) --- AGENTS.md | 6 ++++++ docs/source/contributor-guide/development.md | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/AGENTS.md b/AGENTS.md index 741378286e..a0cc345d0f 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -34,6 +34,12 @@ Relevant entry points: When opening a pull request, use the [PR template](.github/pull_request_template.md) and fill in every section. +Use `git push` for normal updates to a PR branch. If a rebase or amend requires a force push, +use `git push --force-with-lease`, never `--force` or `-f`, to reduce the risk of overwriting +another maintainer's commits. If the lease check rejects the push, inspect and integrate the +remote changes before retrying; do not bypass it with `--force`. See +[Submitting a Pull Request](docs/source/contributor-guide/development.md#submitting-a-pull-request). + ## Checking a change against CI A green pull request does not mean a change is safe to queue. The pull request tier runs the Comet diff --git a/docs/source/contributor-guide/development.md b/docs/source/contributor-guide/development.md index b5752e0863..2bf3bd6ec8 100644 --- a/docs/source/contributor-guide/development.md +++ b/docs/source/contributor-guide/development.md @@ -567,6 +567,12 @@ It is possible to debug both native and JVM code concurrently as described in th ## Submitting a Pull Request +Use `git push` for normal updates to your PR branch. If you need to force push after a rebase +or amend, use `git push --force-with-lease` instead of `git push --force` (or `-f`). This reduces +the risk of accidentally overwriting another maintainer's commits when multiple people push +to the same PR branch. If the lease check rejects the push, inspect and integrate the remote +changes before retrying; do not switch to `--force` to bypass the check. + Before submitting a pull request, follow this checklist to ensure your changes are ready: ### 1. Format Your Code --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
