From: rinpatch Date: Wed, 26 Aug 2020 04:08:02 +0000 (+0300) Subject: release MR template: add a note about merging stable changes back to X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=dcd06488e02408f7e9b459d1da4be2669db0969d;p=akkoma release MR template: add a note about merging stable changes back to develop --- diff --git a/.gitlab/merge_request_templates/Release.md b/.gitlab/merge_request_templates/Release.md index 237f74e00..b2c772696 100644 --- a/.gitlab/merge_request_templates/Release.md +++ b/.gitlab/merge_request_templates/Release.md @@ -3,3 +3,4 @@ * [ ] Compile a changelog * [ ] Create an MR with an announcement to pleroma.social * [ ] Tag the release +* [ ] Merge `stable` into `develop` (in case the fixes are already in develop, use `git merge -s ours --no-commit` and manually merge the changelogs)