⚠️ Upstream Sync Conflict
The following feature branches conflict with apache/airflow:main and need manual rebase:
ErrorMsg_BteqImpr_TTU
ddl_impl
error_msg_improv
ldap_impl
teradata-workflows
How to resolve
git fetch upstream
git checkout <branch>
git rebase upstream/main
# fix conflicts, then:
git add .
git rebase --continue
git push origin <branch> --force-with-lease
Run: https://github.com/Teradata/airflow/actions/runs/27892598073
The following feature branches conflict with
apache/airflow:mainand need manual rebase:ErrorMsg_BteqImpr_TTUddl_implerror_msg_improvldap_implteradata-workflowsHow to resolve
Run: https://github.com/Teradata/airflow/actions/runs/27892598073