Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Doc] fix links in Branch 2.3 (backport #35196) #35209

Merged
merged 1 commit into from
Nov 16, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 16, 2023

This is an automatic backport of pull request #35196 done by Mergify.
Cherry-pick of f05ef56 has failed:

On branch mergify/bp/branch-2.2/pr-35196
Your branch is up to date with 'origin/branch-2.2'.

You are currently cherry-picking commit f05ef5645.
  (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/zh/faq/loading/Stream_load_faq.md
	modified:   docs/zh/sql-reference/sql-statements/data-definition/RECOVER.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   docs/en/faq/loading/Loading_faq.md
	deleted by them: docs/en/introduction/StarRocks_intro.md
	both modified:   docs/zh/faq/loading/Broker_load_faq.md
	both modified:   docs/zh/faq/loading/Loading_faq.md
	deleted by us:   docs/zh/feedback-and-contribute.md
	deleted by them: docs/zh/introduction/StarRocks_intro.md
	both modified:   docs/zh/loading/BrokerLoad.md
	both modified:   docs/zh/quick_start/Create_table.md
	both modified:   docs/zh/quick_start/Import_and_query.md
	both modified:   docs/zh/sql-reference/sql-statements/data-definition/CREATE_INDEX.md
	both modified:   docs/zh/sql-reference/sql-statements/data-definition/create-function.md
	both modified:   docs/zh/table_design/StarRocks_table_design.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Signed-off-by: evelynzhaojie <[email protected]>
(cherry picked from commit f05ef56)

# Conflicts:
#	docs/en/faq/loading/Loading_faq.md
#	docs/en/introduction/StarRocks_intro.md
#	docs/zh/faq/loading/Broker_load_faq.md
#	docs/zh/faq/loading/Loading_faq.md
#	docs/zh/feedback-and-contribute.md
#	docs/zh/introduction/StarRocks_intro.md
#	docs/zh/loading/BrokerLoad.md
#	docs/zh/quick_start/Create_table.md
#	docs/zh/quick_start/Import_and_query.md
#	docs/zh/sql-reference/sql-statements/data-definition/CREATE_INDEX.md
#	docs/zh/sql-reference/sql-statements/data-definition/create-function.md
#	docs/zh/table_design/StarRocks_table_design.md
@mergify mergify bot added the conflicts label Nov 16, 2023
@mergify mergify bot mentioned this pull request Nov 16, 2023
22 tasks
@github-actions github-actions bot added the documentation Improvements or additions to documentation label Nov 16, 2023
@wanpengfei-git wanpengfei-git enabled auto-merge (rebase) November 16, 2023 08:12
@wanpengfei-git wanpengfei-git merged commit 231f988 into branch-2.2 Nov 16, 2023
18 of 19 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-2.2/pr-35196 branch November 16, 2023 08:12
@evelynzhaojie evelynzhaojie restored the mergify/bp/branch-2.2/pr-35196 branch November 16, 2023 08:12
Copy link

[FE Incremental Coverage Report]

pass : 0 / 0 (0%)

Copy link

[BE Incremental Coverage Report]

pass : 0 / 0 (0%)

@wangruin wangruin deleted the mergify/bp/branch-2.2/pr-35196 branch June 25, 2024 11:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge conflicts documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants