From 1e1c01372797d1ec73a84ed36de8d3dea2142a14 Mon Sep 17 00:00:00 2001
From: ms-mahuber <60939654+ms-mahuber@users.noreply.github.com>
Date: Wed, 20 Dec 2023 15:25:26 -0800
Subject: [PATCH 1/4] Create pull_request_template.md

---
 .github/pull_request_template.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .github/pull_request_template.md

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 000000000000..6cd7047402ca
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,6 @@
+<!-- You can set them now ([x]) or set them later using the Github UI -->
+**All** boxes should be checked before merging the PR *(just tick any boxes which don't apply to this PR)*
+- [ ] Followed patch format from upstream recommendation: https://github.com/kata-containers/community/blob/main/CONTRIBUTING.md#patch-format
+- [ ] Include a single commit in a given PR - at least unless there are related commits and each makes sense as a change on its own.
+- [ ] Merge using "create a merge commit" rather than "squash and merge" (or similar)
+- [ ] Run end to end testing for your changes

From 32bbcc3fe6ef3ec4f3e237615ca3141ce70c05f3 Mon Sep 17 00:00:00 2001
From: ms-mahuber <60939654+ms-mahuber@users.noreply.github.com>
Date: Fri, 22 Dec 2023 11:43:41 -0800
Subject: [PATCH 2/4] Update pull_request_template.md

---
 .github/pull_request_template.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 6cd7047402ca..78ca61d9e2f7 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,6 +1,8 @@
 <!-- You can set them now ([x]) or set them later using the Github UI -->
 **All** boxes should be checked before merging the PR *(just tick any boxes which don't apply to this PR)*
 - [ ] Followed patch format from upstream recommendation: https://github.com/kata-containers/community/blob/main/CONTRIBUTING.md#patch-format
-- [ ] Include a single commit in a given PR - at least unless there are related commits and each makes sense as a change on its own.
-- [ ] Merge using "create a merge commit" rather than "squash and merge" (or similar)
-- [ ] Run end to end testing for your changes
+- [ ] Included a single commit in a given PR - at least unless there are related commits and each makes sense as a change on its own.
+- [ ] Merged using "create a merge commit" rather than "squash and merge" (or similar)
+- [ ] Ran end to end testing for your changes
+- [ ] genPolicy only: Builds on Windows
+- [ ] genPolicy only: Updated sample YAMLs' policy annotations, if applicable

From 8161af42ede0bfbe66ec3e78422b3160ff867a49 Mon Sep 17 00:00:00 2001
From: ms-mahuber <60939654+ms-mahuber@users.noreply.github.com>
Date: Fri, 22 Dec 2023 12:16:50 -0800
Subject: [PATCH 3/4] Update pull_request_template.md

---
 .github/pull_request_template.md | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 78ca61d9e2f7..9f119dbf67c2 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,8 +1,25 @@
+<!--
+COMMENT BLOCKS WILL NOT BE INCLUDED IN THE PR.
+Feel free to delete sections of the template which do not apply to your PR, or add additional details
+-->
+
+###### Merge Checklist  <!-- REQUIRED -->
 <!-- You can set them now ([x]) or set them later using the Github UI -->
-**All** boxes should be checked before merging the PR *(just tick any boxes which don't apply to this PR)*
+<!-- **All** boxes should be checked before merging the PR *(just tick any boxes which don't apply to this PR)* -->
 - [ ] Followed patch format from upstream recommendation: https://github.com/kata-containers/community/blob/main/CONTRIBUTING.md#patch-format
 - [ ] Included a single commit in a given PR - at least unless there are related commits and each makes sense as a change on its own.
 - [ ] Merged using "create a merge commit" rather than "squash and merge" (or similar)
-- [ ] Ran end to end testing for your changes
 - [ ] genPolicy only: Builds on Windows
 - [ ] genPolicy only: Updated sample YAMLs' policy annotations, if applicable
+
+###### Summary <!-- REQUIRED -->
+<!-- Quick explanation of the changes. -->
+
+###### Associated issues  <!-- optional -->
+<!-- Link to Github issues if possible. -->
+
+###### Links to CVEs  <!-- optional -->
+<!-- https://nvd.nist.gov/vuln/detail/CVE-YYYY-XXXX -->
+
+###### Test Methodology
+<!-- How was this test validated? i.e. local build, pipeline build etc. -->

From 06942b24ee3630950e97ca502fad51e37ad9ce85 Mon Sep 17 00:00:00 2001
From: ms-mahuber <60939654+ms-mahuber@users.noreply.github.com>
Date: Fri, 22 Dec 2023 12:26:11 -0800
Subject: [PATCH 4/4] Update pull_request_template.md

---
 .github/pull_request_template.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 9f119dbf67c2..5e349cb9cf17 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -8,8 +8,8 @@ Feel free to delete sections of the template which do not apply to your PR, or a
 <!-- **All** boxes should be checked before merging the PR *(just tick any boxes which don't apply to this PR)* -->
 - [ ] Followed patch format from upstream recommendation: https://github.com/kata-containers/community/blob/main/CONTRIBUTING.md#patch-format
 - [ ] Included a single commit in a given PR - at least unless there are related commits and each makes sense as a change on its own.
-- [ ] Merged using "create a merge commit" rather than "squash and merge" (or similar)
-- [ ] genPolicy only: Builds on Windows
+- [ ] Aware about the PR to be merged using "create a merge commit" rather than "squash and merge" (or similar)
+- [ ] genPolicy only: Ensured the tool still builds on Windows
 - [ ] genPolicy only: Updated sample YAMLs' policy annotations, if applicable
 
 ###### Summary <!-- REQUIRED -->