This is an automated email from the ASF dual-hosted git repository.
weilee 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 27f559e8717 docs: Format consistency in `10_working_with_git.rst`
(#47289)
27f559e8717 is described below
commit 27f559e87170b9059f018206bf6dbbaa76529afa
Author: Rafa <[email protected]>
AuthorDate: Mon Mar 3 15:26:33 2025 +0800
docs: Format consistency in `10_working_with_git.rst` (#47289)
* docs: Format consistency in `10_working_with_git.rst`
- Applied double backticks (`example`) to all versions and branch names for
consistency.
- Removed unnecessary period
* docs: remove unneeded comma in `10_working_with_git.rst`
* docs: fix extra space in contributing-docs/10_working_with_git.rst
Co-authored-by: Wei Lee <[email protected]>
---------
Co-authored-by: Wei Lee <[email protected]>
---
contributing-docs/10_working_with_git.rst | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/contributing-docs/10_working_with_git.rst
b/contributing-docs/10_working_with_git.rst
index cf7b1e276c5..6ac8ba34361 100644
--- a/contributing-docs/10_working_with_git.rst
+++ b/contributing-docs/10_working_with_git.rst
@@ -33,13 +33,13 @@ We also have a ``v2-10-test`` branch that is used to test
``2.10.x`` series of A
cherry-pick selected commits from the main branch.
*For Contributors*:
-All bug fixes after 2.10.0 release will target Airflow 3. We will make the
best effort to make them available in 2.10.x,
-but if somebody wants to guarantee that a fix is included in 2.10.x, they need
to raise the PR explicitly to the v2-10-test branch too.
+All bug fixes after ``2.10.0`` release will target Airflow 3. We will make the
best effort to make them available in ``2.10.x``,
+but if somebody wants to guarantee that a fix is included in ``2.10.x``, they
need to raise the PR explicitly to the ``v2-10-test`` branch too.
*For Committers*:
-When merging bugfix PRs to the ``main`` branch, the committers should also try
to cherry-pick it to v2-10-test branch.
+When merging bugfix PRs to the ``main`` branch, the committers should also try
to cherry-pick it to ``v2-10-test`` branch.
If there are merge conflicts, the committer should add a comment on the
original PR, informing the author and asking them
-to raise a separate PR against ``v2-10-test`` branch. If this doesn't happen,
there is no guarantee that the PR will be part of 2.10.x
+to raise a separate PR against ``v2-10-test`` branch. If this doesn't happen,
there is no guarantee that the PR will be part of ``2.10.x``
Cherry-picking is done with the ``-x`` flag. In the future, this can happen
automatically with the help of a bot and appropriate
label on a PR.
@@ -197,7 +197,7 @@ we will be adding the remote as "apache" so you can refer
to it easily
``git rebase --continue``
- And go either to point 6. or 7, depending on whether you have more commits
that cause conflicts in your PR (rebasing applies each
+ And go to either point 6 or 7, depending on whether you have more commits
that cause conflicts in your PR (rebasing applies each
commit from your PR one-by-one).
