andreahlert commented on PR #61615: URL: https://github.com/apache/airflow/pull/61615#issuecomment-3910483287
> Lots of conflicts to resolve ? Sorry for the delay on this one, it turned into one of those “why are there 500 files in my diff” situations 😅 The real conflict was in `dev/breeze/src/airflow_breeze/global_constants.py`, and I kept the current `main` value for the providers matrix (`informatica` + `common.ai`) so we don’t reintroduce unrelated rebase artifacts. I think we're good to go. just finishing the CI -- 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]
