This is an automated email from the ASF dual-hosted git repository. spacewander pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push: new c567cf3 chore: don't use rebase to resolve merge conflicts (#5818) c567cf3 is described below commit c567cf32634cd848cd6314e6b7434f3ebd778ef2 Author: 罗泽轩 <spacewander...@gmail.com> AuthorDate: Wed Dec 15 13:58:00 2021 +0800 chore: don't use rebase to resolve merge conflicts (#5818) --- .github/PULL_REQUEST_TEMPLATE.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index e43448e..862a6ce 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -10,7 +10,8 @@ Please follow the requirements: 2. Test is required for the feat/fix PR, unless you have a good reason 3. Doc is required for the feat PR 4. Use a new commit to resolve review instead of `push -f` -5. Use "request review" to notify the reviewer once you have resolved the review +5. If you need to resolve merge conflicts after the PR is reviewed, please merge master but do not rebase +6. Use "request review" to notify the reviewer once you have resolved the review --> * [ ] Did you explain what problem does this PR solve? Or what new features have been added?