From 53de09d6ec7b5170ccfeca4f7a9d822c037ce7ec Mon Sep 17 00:00:00 2001
From: Jacob Wujciak-Jens <jacob@wujciak.de>
Date: Wed, 11 Jan 2023 23:50:53 +0100
Subject: [PATCH 1/3] update pr template

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

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index f136f8fd499..62878045451 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,4 +1,3 @@
-# Which issue does this PR close?
 
 <!--
 Thanks for opening a pull request!
@@ -25,22 +24,21 @@ In the case of PARQUET issues on JIRA the title also supports:
     PARQUET-${JIRA_ISSUE_ID}: [${COMPONENT}] ${SUMMARY}
 
 -->
-Closes #
 
-# Rationale for this change
+### Rationale for this change
 
 <!--
  Why are you proposing this change? If this is already explained clearly in the issue then this section is not needed.
  Explaining clearly why changes are proposed helps reviewers understand your changes and offer better suggestions for fixes.  
 -->
 
-# What changes are included in this PR?
+### What changes are included in this PR?
 
 <!--
 There is no need to duplicate the description in the issue here but it is sometimes worth providing a summary of the individual changes in this PR.
 -->
 
-# Are these changes tested?
+### Are these changes tested?
 
 <!--
 We typically require tests for all PRs in order to:
@@ -50,7 +48,7 @@ We typically require tests for all PRs in order to:
 If tests are not included in your PR, please explain why (for example, are they covered by existing tests)?
 -->
 
-# Are there any user-facing changes?
+### Are there any user-facing changes?
 
 <!--
 If there are user-facing changes then we may require documentation to be updated before approving the PR.

From 9e0384428767a68209733aa16de671837f911924 Mon Sep 17 00:00:00 2001
From: Jacob Wujciak-Jens <jacob@wujciak.de>
Date: Mon, 16 Jan 2023 01:25:06 +0100
Subject: [PATCH 2/3] remove comments from commit message

---
 dev/merge_arrow_pr.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/merge_arrow_pr.py b/dev/merge_arrow_pr.py
index 068dfb204e5..c325ddd9d09 100755
--- a/dev/merge_arrow_pr.py
+++ b/dev/merge_arrow_pr.py
@@ -581,6 +581,8 @@ def extract_co_authors(commit):
         commit_title = f'{self.title} (#{self.number})'
         commit_message_chunks = []
         if self.body is not None:
+            # Remove comments (i.e. <-- comment -->) from the pull request description.
+            body = re.sub(r"<--.*-->", "", self.body)
             # avoid github user name references by inserting a space after @
             body = re.sub(r"@(\w+)", "@ \\1", self.body)
             commit_message_chunks.append(body)

From 7ff903db50f7f770aff4af39e92cb854be573f5e Mon Sep 17 00:00:00 2001
From: Jacob Wujciak-Jens <jacob@wujciak.de>
Date: Mon, 16 Jan 2023 01:40:16 +0100
Subject: [PATCH 3/3] fix regex

---
 dev/merge_arrow_pr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/merge_arrow_pr.py b/dev/merge_arrow_pr.py
index c325ddd9d09..dbfa58df9ee 100755
--- a/dev/merge_arrow_pr.py
+++ b/dev/merge_arrow_pr.py
@@ -582,7 +582,7 @@ def extract_co_authors(commit):
         commit_message_chunks = []
         if self.body is not None:
             # Remove comments (i.e. <-- comment -->) from the pull request description.
-            body = re.sub(r"<--.*-->", "", self.body)
+            body = re.sub(r"<!--(.|\s)*-->", "", self.body)
             # avoid github user name references by inserting a space after @
             body = re.sub(r"@(\w+)", "@ \\1", self.body)
             commit_message_chunks.append(body)