potiuk commented on code in PR #65629:
URL: https://github.com/apache/airflow/pull/65629#discussion_r3120738478
##########
contributing-docs/18_contribution_workflow.rst:
##########
@@ -165,15 +165,18 @@ Step 4: Prepare PR
`How to sync your fork <10_working_with_git.rst#how-to-sync-your-fork>`_
for details.
* Create a local branch for your development. Make sure to use latest
- ``apache/main`` as base for the branch. See `How to Rebase PR
</contributing-docs/10_working_with_git.rst#how-to-rebase-pr>`_ for some details
- on setting up the ``apache`` remote. Note, some people develop their
changes directly in their own
- ``main`` branches - this is OK and you can make PR from your main to
``apache/main`` but we
+ ``upstream/main`` as base for the branch. See `How to Rebase PR
</contributing-docs/10_working_with_git.rst#how-to-rebase-pr>`_ for details
+ on setting up the ``upstream`` remote (Airflow standardises on
``upstream`` →
+ ``apache/airflow`` and ``origin`` → your fork — see
+ `Git remote naming conventions
</contributing-docs/10_working_with_git.rst#git-remote-naming-conventions>`_).
+ Note, some people develop their changes directly in their own
+ ``main`` branches - this is OK and you can make PR from your main to
``upstream/main`` but we
Review Comment:
Good catch — thanks. Went with the more permissive stance (matching the
long-standing `18_contribution_workflow` wording) and cross-linked the two
places. Pushed in 417e4efafa. `AGENTS.md` keeps the stricter "no pushes to
main" rule because that advice is aimed at automated agents where branch-only
workflows are the right default.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
