From c77df63e0207197001921e09b2857eb5320910c9 Mon Sep 17 00:00:00 2001
From: Thomas Zerr <thomas.zerr@cloudogu.com>
Date: Fri, 1 Sep 2023 11:10:43 +0200
Subject: [PATCH] -fixed: merging from main instead of release tag

---
 docs/en/release-process.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/release-process.md b/docs/en/release-process.md
index 557f663487..3cc32c0ca6 100644
--- a/docs/en/release-process.md
+++ b/docs/en/release-process.md
@@ -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: