This repository contains our fork of Airflow, which we use to make some tweaks and fix bugs before they're addressed in official Airflow releases. The code in the at-working branch should be the same as the code that is deployed on our Airflow server(s).
To sync changes from the original Airflow repository, run the following:
Add the upstream repo as a remote. You only need to do this once.
git remote add upstream [email protected]:apache/incubator-airflow.git
git remote -v
You should see something like this:
origin [email protected]:All-Turtles/incubator-airflow.git (fetch)
origin [email protected]:All-Turtles/incubator-airflow.git (push)
upstream [email protected]:apache/incubator-airflow.git (fetch)
upstream [email protected]:apache/incubator-airflow.git (push)
Fetch changes from the upstream and merge them.
git fetch upstream
git checkout master
git merge upstream/master
git push
git push --tags