ashb commented on pull request #20000: URL: https://github.com/apache/airflow/pull/20000#issuecomment-988019541
Conflict is only in the import section: ``` <<<<<<< models-typing-partial from airflow.utils.session import NEW_SESSION, create_session, provide_session ======= from airflow.utils.retries import run_with_db_retries from airflow.utils.session import create_session, provide_session >>>>>>> main ``` so once these tests pass I'll fix conflict then merge without waiting for another test run. -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
