Include the commit message conditionally

pascalgn · Mar 24, 2022 · d362948 · d362948
1 parent 0f74758
commit d362948
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/merge.js b/lib/merge.js
@@ -379,7 +379,7 @@ function getCommitMessage(mergeCommitMessage, pullRequest) {
   } else if (mergeCommitMessage === "pull-request-description") {
     return pullRequest.body;
   } else if (mergeCommitMessage === "pull-request-title-and-description") {
-    return pullRequest.title + "\n\n" + pullRequest.body;
+    return pullRequest.title + (pullRequest.body ? "\n\n" + pullRequest.body : '');
   } else {
     return mergeCommitMessage.replace(PR_PROPERTY, (_, prProp) =>
       resolvePath(pullRequest, prProp)