From 585c3f686b8c4897312c2fb8c86abdbfe1d7dae9 Mon Sep 17 00:00:00 2001 From: Angela P Wen Date: Fri, 7 Oct 2022 09:34:53 -0700 Subject: [PATCH 1/2] Clarify merging with merge commit --- .github/update-release-branch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/update-release-branch.py b/.github/update-release-branch.py index 9d20e38ebf..b547b1736f 100644 --- a/.github/update-release-branch.py +++ b/.github/update-release-branch.py @@ -104,7 +104,7 @@ def open_pr( body.append(' - [ ] Wait for the "Update dependencies" workflow to push a commit updating the dependencies.') body.append(' - [ ] Mark the PR as ready for review to trigger the full set of PR checks.') - body.append(' - [ ] Approve and merge this PR.') + body.append(' - [ ] Approve and merge this PR. Make sure `Create a merge commit` is selected rather than `Squash and merge` or `Rebase and merge`.') if is_v2_release: body.append(' - [ ] Merge the mergeback PR that will automatically be created once this PR is merged.') From 856bfc8bee27c052dbd3e2c2ebb19fe13fa70eb0 Mon Sep 17 00:00:00 2001 From: Angela P Wen Date: Fri, 7 Oct 2022 10:01:59 -0700 Subject: [PATCH 2/2] Add merge commit message to mergeback PRs --- .github/workflows/post-release-mergeback.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/post-release-mergeback.yml b/.github/workflows/post-release-mergeback.yml index 7b8b8a7768..1ba81b2b2a 100644 --- a/.github/workflows/post-release-mergeback.yml +++ b/.github/workflows/post-release-mergeback.yml @@ -122,7 +122,7 @@ jobs: - [ ] Remove and re-add the "Update dependencies" label to the PR to trigger just this workflow. - [ ] Wait for the "Update dependencies" workflow to push a commit updating the dependencies. - [ ] Mark the PR as ready for review to trigger the full set of PR checks. - - [ ] Approve and merge the PR. + - [ ] Approve and merge the PR. Make sure `Create a merge commit` is selected rather than `Squash and merge` or `Rebase and merge`. EOF )