mergify[bot]

Welcome to ccf-deadlines! We're delighted to have you onboard (p≧w≦q)

Great job! Thank you @dodoxxb for your contribution!

@martinsoees, this pull request is now in conflict and requires a rebase.

@martinsoees, this pull request is now in conflict and requires a rebase.

@martinsoees, this pull request is now in conflict and requires a rebase.

@martinsoees, this pull request is now in conflict and requires a rebase.

Cherry-pick of 9c899bd9750592a924d3b1a38b48c15571e22827 has failed: ``` On branch mergify/bp/1.x/pr-275 Your branch is up to date with 'origin/1.x'. You are currently cherry-picking commit 9c899bd. (fix conflicts and run "git cherry-pick --continue")...

> rebase #### ☑️ Nothing to do - [ ] `-conflict` [📌 rebase requirement] - [X] `-closed` [📌 rebase requirement] - [X] `queue-position = -1` [📌 rebase requirement] - [X]...

Cherry-pick of 3e08471b9b54332ecd49c375823064f9e836a8da has failed: ``` On branch mergify/bp/1.x/pr-7218 Your branch is ahead of 'origin/1.x' by 2 commits. (use "git push" to publish your local commits) You are currently cherry-picking...

@weiliu1031 Please associate the related pr of master to the body of your Pull Request. (eg. "pr: #")