This is an automated email from the ASF dual-hosted git repository.
kaxilnaik 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 1cd3d8f Update docs on syncing forks (#17675)
1cd3d8f is described below
commit 1cd3d8f94f23396e2f1367822fecc466db3dd170
Author: Kaxil Naik <[email protected]>
AuthorDate: Wed Aug 18 10:34:47 2021 +0100
Update docs on syncing forks (#17675)
* Update docs on syncing forks
closes https://github.com/apache/airflow/issues/17665
---
CONTRIBUTING.rst | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 8874a8d..2bd9c2a 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1230,11 +1230,11 @@ How to sync your fork
When you have your fork, you should periodically synchronize the main of your
fork with the
Apache Airflow main. In order to do that you can ``git pull --rebase`` to your
local git repository from
apache remote and push the main (often with ``--force`` to your fork). There
is also an easy
-way using ``Force sync main from apache/airflow`` workflow. You can go to
"Actions" in your repository and
-choose the workflow and manually trigger the workflow using "Run workflow"
command.
+way to sync your fork in GitHub's web UI with the `Fetch upstream feature
+<https://docs.github.com/en/github/collaborating-with-pull-requests/working-with-forks/syncing-a-fork#syncing-a-fork-from-the-web-ui>`_.
-This will force-push the main from apache/airflow to the main in your fork.
Note that in case you
-modified the main in your fork, you might loose those changes.
+This will force-push the ``main`` branch from ``apache/airflow`` to the
``main`` branch
+in your fork. Note that in case you modified the main in your fork, you might
loose those changes.
How to rebase PR
