From caf97d41edadcf73f2b6f7ea24c41842fd259025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 19 Jun 2020 07:28:31 +0200 Subject: [PATCH] Add hint for support branch --- docs/en/release-process.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/en/release-process.md b/docs/en/release-process.md index da43b21f77..cd3123589d 100644 --- a/docs/en/release-process.md +++ b/docs/en/release-process.md @@ -11,6 +11,14 @@ Make sure you have no changes you want to keep! git fetch && git checkout -f origin/develop && git clean -fd && git checkout -B develop ``` +## Merge support branch + +Check whether there is an integration branch for the previous release or bugfixes not merged into the develop branch. Merge them now. + +``` +git merge origin/support/ +``` + ## Modify Changelog Change "Unreleased" header in `CHANGELOG.md` to ` - ` @@ -54,6 +62,14 @@ Make sure you have no changes you want to keep! git fetch && git checkout -f origin/develop && git clean -fd && git checkout -B develop ``` +## Merge support branch + +Check whether there is an integration branch for the previous release or bugfixes not merged into the develop branch. Merge them now. + +``` +git merge origin/support/ +``` + ## Update SCM parent if necessary If you need to update the parent of the plugin to a new release of SCM-Manager, change it now: