potiuk commented on PR #69231: URL: https://github.com/apache/airflow/pull/69231#issuecomment-5146539690
Following up on my approval — the merge is blocked. This branch is ~734 commits behind `main` and now conflicts, so it needs a rebase before it can land. The conflict is almost certainly in `airflow-core/tests/unit/always/test_project_structure.py`: that exemption list has churned a lot since you opened this, with entries added and removed by other PRs. Your line is still there on `main` (line 174, `"providers/http/tests/unit/http/test_exceptions.py"`), so the change is still needed — it's the surrounding lines that moved. Resolution should be mechanical: rebase, keep your removal of that single line, and take `main`'s version of the rest of the list. The new test file itself shouldn't conflict at all, since nothing else touches it. Nothing further from me on the content — my review stands. --- Drafted-by: Claude Code (Opus 5); reviewed by @potiuk before posting -- 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]
