From 1cc5fdd7a63a4d62b0f2c437a478c67a0ab2caae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Ros?= Date: Mon, 25 Nov 2024 12:16:06 -0800 Subject: [PATCH] Update release instructions --- .github/ISSUE_TEMPLATE/release.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md index a841f6f7ea7..42c91145722 100644 --- a/.github/ISSUE_TEMPLATE/release.md +++ b/.github/ISSUE_TEMPLATE/release.md @@ -60,8 +60,8 @@ Do the harder parts of making the release public. This should come after everyth - [ ] Tag the head of `release/` with the version. Include `v` in the name, e.g. `v1.8.0`. - [ ] Merge `release/` to `main`. - You'll need to create a pull request. - - Merge it as a merge commit, not squash merge. - - If there are merge conflicts, then create a `release/-integration` branch and fix them there. + - If this is a main branch release (release/x.y), squash merge the PR. If this is a patch release (release/x.y.z for instance) don't resolve the conflicts in GH (as it would merge main to release/x.y.z) but in git. Then push from git. + - Restore the branch that GH deletes automatically from the merged PR. - [ ] Create and publish a release [on GitHub](https://github.com/OrchardCMS/OrchardCore/releases/new). - Generate release notes. - Add a link to the release notes in the docs (something like `For details on this version see the [release notes in the documentation](link here).`). Note that the docs will only be built once the branch is merged to `main`.