You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@airflow.apache.org by GitBox <gi...@apache.org> on 2022/01/10 04:18:23 UTC

[GitHub] [airflow] edithturn commented on pull request #20701: [WIP] Check free space python

edithturn commented on pull request #20701:
URL: https://github.com/apache/airflow/pull/20701#issuecomment-1008531499


   > Something went wrong with the rebase :(
   
    @potiuk how do I know which of the changes I should consider?
   should I check the main airflow and match it with that to accept incoming change or current change?
   
   Example:
   
   `<<<<<<< check-free-space-python
   from typing import TYPE_CHECKING, Iterable, Optional, Tuple, Union
   =======
   from typing import TYPE_CHECKING, Iterable, Optional, Tuple, cast
   >>>>>>> main
   `


-- 
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: commits-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org