The GitHub Actions job "Required Checks" on texera.git/task/addOrcidLogin has succeeded. Run started by GitHub user Neilk1021 (triggered by Neilk1021).
Head commit for run: fb847ea3561c47541d5f0877a08c63731cdfd47b / Neilk1021 <[email protected]> Merge remote-tracking branch 'upstream/main' into task/addOrcidLogin Two conflicts, both from the migration numbering: - sql/updates/45.sql (add/add): upstream removed the deprecated project feature under id 45 (#7464), which this branch had also used for the ORCID enum value. Upstream's 45 is merged, so it keeps the id; the ORCID migration is renumbered to 46 with its contents unchanged. - sql/changelog.xml: keep upstream's changeSet 45 and register the ORCID migration as changeSet 46. texera_ddl.sql auto-merged correctly: provider_type_enum stays ('LOCAL', 'GOOGLE', 'ORCID') while upstream's project tables are gone. Report URL: https://github.com/apache/texera/actions/runs/33700358330 With regards, GitHub Actions via GitBox
