Skip to content

⚠️ Upstream conflict: ErrorMsg_BteqImpr_TTU, ddl_impl, error_msg_improv, ldap_impl, teradata-workflows #74

Description

@github-actions

⚠️ 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/28492022536

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions