Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-28 01:10:49 +01:00
Code Issues Packages Projects Releases Activity

Add hint for support branch

Browse Source
This commit is contained in:
René Pfeuffer
2020-06-19 07:28:31 +02:00
committed by GitHub
parent fffe10fba6
commit caf97d41ed
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
docs/en/release-process.md
View File

@@ -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/<support branch>
```
## Modify Changelog
Change "Unreleased" header in `CHANGELOG.md` to `<version> - <current date>`
@@ -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/<support branch>
```
## 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: