From a049c9aaf76377b000c6a30a597a62fe44002216 Mon Sep 17 00:00:00 2001
From: Keke Yi <40977455+yikeke@users.noreply.github.com>
Date: Tue, 3 Mar 2020 22:23:32 +0800
Subject: [PATCH 1/2] cherry pick #2349 to release-3.1

Signed-off-by: sre-bot <sre-bot@pingcap.com>
---
 .github/pull_request_template.md | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 33515c639c9c..bc60fbb4c447 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,20 +1,28 @@
 <!--Thanks for your contribution to TiDB documentation. See [CONTRIBUTING](https://github.com/pingcap/community/blob/master/CONTRIBUTING.md) before filing this pull request (PR).-->
 
-### What is changed, added or deleted? <!--Required-->
+### What is changed, added or deleted? (Required)
 
 <!--Tell us what you did and why. This is important to help reviewers and community members understand your PR.-->
 
-### What is the related PR or file link(s)? <!--Required-->
+### Which TiDB version(s) do your changes apply to? (Required)
 
-<!--Give us some reference link(s) that might help quickly review and merge your PR, for example, a file link that supports why you changed the document.-->
+<!--Tick the checkbox(es) below to choose the TiDB version(s) that your changes apply to.-->
+
+- [ ] master (the latest development version, including v4.0 changes for now)
+- [ ] v3.1 (TiDB 3.1 versions)
+- [ ] v3.0 (TiDB 3.0 versions)
+- [ ] v2.1 (TiDB 2.1 versions)
 
-- Reference link(s):<!--Give links here-->
-- This PR is to align with:<!--Give links here-->
-- [ ] N/A (not applicable)
+**If you select two or more versions from above**, to trigger the bot to cherry-pick this PR to your desired release version branch(es), you **must** add corresponding labels such as **needs-cherry-pick-3.1**, **needs-cherry-pick-3.0**, and **needs-cherry-pick-2.1**.
 
-**Important Notice:**
+### What is the related PR or file link(s)?
 
-**If your changes apply to multiple TiDB documentation versions**, to trigger the bot to cherry-pick this PR to other release branches, make sure you add labels such as:
+<!--Give us some reference link(s) that might help quickly review and merge your PR, for example, a file link that supports why you changed the document.-->
 
+<<<<<<< HEAD
 - **needs-cherry-pick-3.0**
 - **needs-cherry-pick-2.1**
+=======
+- This PR is translated from:<!--Give links here-->
+- Other reference link(s):<!--Give links here-->
+>>>>>>> 9a360fb... .github: update pull request template (#2349)

From 542661d98c4408d28f5b6e31ebe33464aba7f496 Mon Sep 17 00:00:00 2001
From: Keke Yi <40977455+yikeke@users.noreply.github.com>
Date: Tue, 3 Mar 2020 22:27:57 +0800
Subject: [PATCH 2/2] Update pull_request_template.md

---
 .github/pull_request_template.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index bc60fbb4c447..abc6eb925e3a 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -19,10 +19,5 @@
 
 <!--Give us some reference link(s) that might help quickly review and merge your PR, for example, a file link that supports why you changed the document.-->
 
-<<<<<<< HEAD
-- **needs-cherry-pick-3.0**
-- **needs-cherry-pick-2.1**
-=======
 - This PR is translated from:<!--Give links here-->
 - Other reference link(s):<!--Give links here-->
->>>>>>> 9a360fb... .github: update pull request template (#2349)