ashb commented on PR #46032: URL: https://github.com/apache/airflow/pull/46032#issuecomment-2640577659
> Use the command line to resolve conflicts before continuing. > `providers/src/airflow/providers/cncf/kubernetes/operators/pod.py` This is a "fake" conflict. `git` on the CLI does it without complaining (it just got renamed). If this current run passes I am merging after rebasing without waiting for next tests to pass. -- 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]
