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] Revise Backup Restore according to feedback (backport #53738) #53817

Merged
merged 3 commits into from
Dec 11, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 11, 2024

Signed-off-by: EsoragotoSpirit [email protected]

Why I'm doing:

What I'm doing:

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

(cherry picked from commit edd5009)

# Conflicts:
#	docs/en/table_design/data_distribution/list_partitioning.md
#	docs/zh/table_design/data_distribution/list_partitioning.md
@mergify mergify bot added the conflicts label Dec 11, 2024
Copy link
Contributor Author

mergify bot commented Dec 11, 2024

Cherry-pick of edd5009 has failed:

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

You are currently cherry-picking commit edd5009ce6.
  (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/en/sql-reference/sql-statements/backup_restore/CREATE_REPOSITORY.md
	modified:   docs/en/table_design/data_distribution/expression_partitioning.md
	modified:   docs/zh/sql-reference/sql-statements/backup_restore/CREATE_REPOSITORY.md
	modified:   docs/zh/table_design/data_distribution/expression_partitioning.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/en/table_design/data_distribution/list_partitioning.md
	both modified:   docs/zh/table_design/data_distribution/list_partitioning.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

@github-actions github-actions bot added documentation Improvements or additions to documentation automerge labels Dec 11, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) December 11, 2024 06:18
@mergify mergify bot closed this Dec 11, 2024
Copy link
Contributor Author

mergify bot commented Dec 11, 2024

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

auto-merge was automatically disabled December 11, 2024 06:18

Pull request was closed

@wanpengfei-git wanpengfei-git enabled auto-merge (squash) December 11, 2024 06:24
Signed-off-by: 絵空事スピリット <[email protected]>
Signed-off-by: 絵空事スピリット <[email protected]>
@wanpengfei-git wanpengfei-git merged commit c4e0a2c into branch-3.2 Dec 11, 2024
27 of 28 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.2/pr-53738 branch December 11, 2024 06:32
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 version:3.2.13
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants