This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 7bfdc8e0933 Add rebase instruction to AGENTS.md before pushing PRs
(#63601)
7bfdc8e0933 is described below
commit 7bfdc8e093342f5113f431d5be1a45712bb09796
Author: Jarek Potiuk <[email protected]>
AuthorDate: Sat Mar 14 15:30:34 2026 +0100
Add rebase instruction to AGENTS.md before pushing PRs (#63601)
Co-authored-by: Claude Opus 4.6 (1M context) <[email protected]>
---
AGENTS.md | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/AGENTS.md b/AGENTS.md
index 63e7bd0f16a..236d953c115 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -145,6 +145,17 @@ code review checklist in
[`.github/instructions/code-review.instructions.md`](.g
7. Find which tests to run for the changes with selective-checks and run those
tests in parallel to confirm they pass and check for CI-specific issues.
8. Check for security issues — no secrets, no injection vulnerabilities, no
unsafe patterns.
+Before pushing, always rebase your branch onto the latest target branch
(usually `main`)
+to avoid merge conflicts and ensure CI runs against up-to-date code:
+
+```bash
+git fetch <upstream-remote> <target_branch>
+git rebase <upstream-remote>/<target_branch>
+```
+
+If there are conflicts, resolve them and continue the rebase. If the rebase is
too complex,
+ask the user for guidance.
+
Then push the branch to the fork remote and open the PR creation page in the
browser
with the body pre-filled (including the generative AI disclosure already
checked):
