release MR template: add a note about merging stable changes back to

develop
2020-08-26 07:08:02 +03:00 · 2020-08-26 07:08:02 +03:00 · dcd06488e0
commit dcd06488e0
parent fd04137e18
1 changed files with 1 additions and 0 deletions
--- 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)