Skip to content

Commit

Permalink
Update docs on syncing forks (#17675)
Browse files Browse the repository at this point in the history
* Update docs on syncing forks

closes #17665
  • Loading branch information
kaxil authored Aug 18, 2021
1 parent 7c96800 commit 1cd3d8f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1cd3d8f

Please sign in to comment.