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] Add example for setting multiple variables (backport #35940) #35948

Merged
merged 2 commits into from
Nov 28, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 28, 2023

This is an automatic backport of pull request #35940 done by Mergify.
Cherry-pick of 8718b9d has failed:

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

You are currently cherry-picking commit 8718b9d308.
  (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/sql-reference/sql-statements/Administration/SET.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/en/sql-reference/sql-statements/Administration/SET.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: 絵空事スピリット <[email protected]>
(cherry picked from commit 8718b9d)

# Conflicts:
#	docs/en/sql-reference/sql-statements/Administration/SET.md
@mergify mergify bot added the conflicts label Nov 28, 2023
@github-actions github-actions bot added the documentation Improvements or additions to documentation label Nov 28, 2023
@wanpengfei-git wanpengfei-git enabled auto-merge (rebase) November 28, 2023 07:33
@mergify mergify bot closed this Nov 28, 2023
auto-merge was automatically disabled November 28, 2023 07:33

Pull request was closed

Copy link
Contributor Author

mergify bot commented Nov 28, 2023

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

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-35940 branch November 28, 2023 07:33
@EsoragotoSpirit EsoragotoSpirit restored the mergify/bp/branch-2.5/pr-35940 branch November 28, 2023 07:38
@wanpengfei-git wanpengfei-git enabled auto-merge (rebase) November 28, 2023 07:38
Signed-off-by: 絵空事スピリット <[email protected]>
@wanpengfei-git wanpengfei-git merged commit a9a1af9 into branch-2.5 Nov 28, 2023
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-2.5/pr-35940 branch November 28, 2023 07:39
Copy link

[FE Incremental Coverage Report]

pass : 0 / 0 (0%)

Copy link

[BE Incremental Coverage Report]

pass : 0 / 0 (0%)

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