Closes #10 from gengliangwang/revert.

gengliangwang · gengliangwang · commit b72c63e566f2 · 2022-09-06T16:38:20.000-07:00
Authored-by: Gengliang Wang &lt;gengliang@apache.org&gt;
    Signed-off-by: Gengliang Wang &lt;gengliang@apache.org&gt;
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
@@ -171,8 +171,8 @@ def merge_pr(pr_num, target_ref, title, body, pr_repo_desc):
         )
         merge_message_flags += ["-m", message]
 
-    # The string "Merges #%s" string is required for GitHub to correctly close the PR
-    merge_message_flags += ["-m", "Merges #%s from %s." % (pr_num, pr_repo_desc)]
+    # The string "Closes #%s" string is required for GitHub to correctly close the PR
+    merge_message_flags += ["-m", "Closes #%s from %s." % (pr_num, pr_repo_desc)]
 
     authors = "Authored-by:" if len(distinct_authors) == 1 else "Lead-authored-by:"
     authors += " %s" % (distinct_authors.pop(0))

Original file line number	Diff line number	Diff line change
`@@ -171,8 +171,8 @@ def merge_pr(pr_num, target_ref, title, body, pr_repo_desc):`
`171`	`171`	`)`
`172`	`172`	`merge_message_flags += ["-m", message]`
`173`	`173`
`174`		`- # The string "Merges #%s" string is required for GitHub to correctly close the PR`
`175`		`- merge_message_flags += ["-m", "Merges #%s from %s." % (pr_num, pr_repo_desc)]`
	`174`	`+ # The string "Closes #%s" string is required for GitHub to correctly close the PR`
	`175`	`+ merge_message_flags += ["-m", "Closes #%s from %s." % (pr_num, pr_repo_desc)]`
`176`	`176`
`177`	`177`	`authors = "Authored-by:" if len(distinct_authors) == 1 else "Lead-authored-by:"`
`178`	`178`	`authors += " %s" % (distinct_authors.pop(0))`