From c565451faa5eab2141a3cf75ca5b24bdeec746aa Mon Sep 17 00:00:00 2001 From: Christoph Langer Date: Tue, 8 Oct 2024 15:20:16 +0200 Subject: [PATCH] SapMachine #178: Update pull_request_template.md There should be clearer instructions for merging PRs directly in the template text. --- .github/pull_request_template.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index ef992a92ada..2cfa6a4332a 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,4 +1,8 @@ -The description of this pull request goes here. +Replace this line with a description of this pull request and replace Issue in `fixes #Issue` down below with an issue number. Otherwise PR testing will fail. -fixes #Issue +When integrating please make sure you: +- Create a merge commit when merging an OpenJDK upstream PR +- Use Rebase & Merge when your PR contains only one commit with a commit message of the form `SapMachine #: ` +- Use Squash and merge when there are several commits on the PR and with that update the commit message to `SapMachine #: ` and remove commit messages from sub-commits +fixes #Issue