Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-06 12:20:56 +01:00
Code Issues Packages Projects Releases Activity

-fixed: merging from main instead of release tag

Browse Source
This commit is contained in:
Thomas Zerr
2023-09-01 11:10:43 +02:00
parent 31c4d22515
commit c77df63e02
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,7 +134,7 @@ of the hotfix has been updated to the new release version. So you have to merge
```
git checkout develop
git merge 2.30.1
git merge main
```
How these conflicts should be merged depends on the version that has been released: