Closed mergify[bot] closed 10 hours ago
Cherry-pick of e08e8d6b30657f4c50c6c66a3c0449e829e6c359 has failed:
On branch mergify/bp/branch-3.1/pr-47627
Your branch is up to date with 'origin/branch-3.1'.
You are currently cherry-picking commit e08e8d6b30.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: docs/docusaurus/README.md
modified: docs/en/integrations/BI_integrations/Querybook.md
modified: docs/en/integrations/superset_support.md
modified: docs/en/loading/Flink-connector-starrocks.md
modified: docs/en/loading/Flink_cdc_load.md
modified: docs/en/loading/Kafka-connector-starrocks.md
modified: docs/en/sql-reference/data-types/semi_structured/JSON.md
modified: docs/zh/integrations/BI_integrations/Querybook.md
modified: docs/zh/integrations/superset_support.md
modified: docs/zh/loading/Flink-connector-starrocks.md
modified: docs/zh/loading/Flink_cdc_load.md
modified: docs/zh/loading/automq-routine-load.md
modified: docs/zh/release_notes/release-2.3.md
modified: docs/zh/sql-reference/data-types/semi_structured/JSON.md
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
deleted by us: docs/en/release_notes/release-2.3.md
both modified: docs/zh/data_source/External_table.md
deleted by us: docs/zh/release_notes/release-3.2.md
both modified: docs/zh/sql-reference/sql-statements/data-definition/CREATE_RESOURCE.md
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr
Signed-off-by: EsoragotoSpirit wanglichen@starrocks.com
Why I'm doing:
What I'm doing:
Fixes #47620
What type of PR is this:
Does this PR entail a change in behavior?
If yes, please specify the type of change:
Checklist:
Bugfix cherry-pick branch check:
This is an automatic backport of pull request #47627 done by Mergify. Signed-off-by: EsoragotoSpirit wanglichen@starrocks.com
Why I'm doing:
What I'm doing:
Fixes #47620
What type of PR is this:
Does this PR entail a change in behavior?
If yes, please specify the type of change:
Checklist: