Fokko opened a new pull request #6442: [AIRFLOW-5771] Merge alembic heads URL: https://github.com/apache/airflow/pull/6442 ``` MacBook-Pro-van-Fokko:airflow fokkodriesprong$ alembic heads --verbose Merges: 004c1210f153, 74effc47d867 Path: /Users/fokkodriesprong/Desktop/incubator-airflow/airflow/migrations/versions/b0125267960b_merge_004c1210f153_and_74effc47d867.py merge 004c1210f153 and 74effc47d867 Revision ID: b0125267960b Revises: 004c1210f153, 74effc47d867 Create Date: 2019-10-18 08:45:11.598735 Rev: b3b105409875 (head) Parent: d38e04c12aa2 Path: /Users/fokkodriesprong/Desktop/incubator-airflow/airflow/migrations/versions/b3b105409875_add_root_dag_id_to_dag.py add root_dag_id to DAG Revision ID: b3b105409875 Revises: d38e04c12aa2 Create Date: 2019-09-28 23:20:01.744775 ``` And then: ``` MacBook-Pro-van-Fokko:airflow fokkodriesprong$ alembic merge -m "Merge 74effc47d867 and b3b105409875" b0125267960b b3b105409875 Generating /Users/fokkodriesprong/Desktop/incubator-airflow/airflow/migrations/versions/0b2d9a271263_merge_74effc47d867_and_b3b105409875.py ... done ``` Make sure you have checked _all_ steps below. ### Jira - [ ] My PR addresses the following [Airflow Jira](https://issues.apache.org/jira/browse/AIRFLOW/) issues and references them in the PR title. For example, "\[AIRFLOW-XXX\] My Airflow PR" - https://issues.apache.org/jira/browse/AIRFLOW-XXX - In case you are fixing a typo in the documentation you can prepend your commit with \[AIRFLOW-XXX\], code changes always need a Jira issue. - In case you are proposing a fundamental code change, you need to create an Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvements+Proposals)). - In case you are adding a dependency, check if the license complies with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x). ### Description - [ ] Here are some details about my PR, including screenshots of any UI changes: ### Tests - [ ] My PR adds the following unit tests __OR__ does not need testing for this extremely good reason: ### Commits - [ ] My commits all reference Jira issues in their subject lines, and I have squashed multiple commits if they address the same issue. In addition, my commits follow the guidelines from "[How to write a good git commit message](http://chris.beams.io/posts/git-commit/)": 1. Subject is separated from body by a blank line 1. Subject is limited to 50 characters (not including Jira issue reference) 1. Subject does not end with a period 1. Subject uses the imperative mood ("add", not "adding") 1. Body wraps at 72 characters 1. Body explains "what" and "why", not "how" ### Documentation - [ ] In case of new functionality, my PR adds documentation that describes how to use it. - All the public functions and the classes in the PR contain docstrings that explain what it does - If you implement backwards incompatible changes, please leave a note in the [Updating.md](https://github.com/apache/airflow/blob/master/UPDATING.md) so we can assign it to a appropriate release
---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
