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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
