andreahlert commented on PR #163: URL: https://github.com/apache/airflow-steward/pull/163#issuecomment-4561809886
> Hi @andreahlert — was sweeping the PR queue and tried a maintainer-side rebase to bring this onto current `main`, but the conflicts in `README.md` and `docs/modes.md` aren't mechanical: the mode taxonomy on `main` has evolved (mode counts changed, Mentoring and Pairing moved from "proposed" to "experimental"), so wiring the `release-management` family into the families table needs a real composition pass. > > Whenever you next pick this up, a rebase from your end would be great. You'll also pick up the new `tests-ok` umbrella CI job from #341, which replaces the individual `pytest (...)` matrix entries in `.asf.yaml`. > > No rush — just flagging so it's not a surprise on next push. rebased. merge in c447a81, only real conflict was the Pairing row in docs/modes.md — kept your experimental | 1 from #251, didn't regress it also synced the mentoring row in README.md to experimental since #252 already moved it there in modes.md but README was still saying "proposed — not yet formally adopted" .asf.yaml auto-merged clean, picked up the tests-ok umbrella from #341. CI is running now while I was in there I also fixed the two diagram nits @justinmclean had left open on process.md (flowchart edges + stateDiagram terminals), commit 9056cbb -- 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]
