From af66c6e5964dd076a28fe7897e078fe8707435ed Mon Sep 17 00:00:00 2001
From: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>
Date: Mon, 26 Aug 2024 15:07:13 +0200
Subject: Update release steps in regards to release branches (#306)

based on the fact that we now only create release branches if they are actually necessary
---
 docs/development/releases.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/development/releases.md')

diff --git a/docs/development/releases.md b/docs/development/releases.md
index 4145f0c..aed3b3d 100644
--- a/docs/development/releases.md
+++ b/docs/development/releases.md
@@ -27,9 +27,9 @@ The process is ever changing in order to simplify it so these steps outlined mig
 
 The current process of making release (includinging release candidate) is:
 
-1. Make release branch (`MAJOR.MINOR.X`) (if not exists)
+1. Make release branch (`MAJOR.MINOR.X`) (only if commits need to be cherry-picked)
 
-2. Merge desired commits from `main`
+2. Take desired commits from `main`
     - Make sure to consider whether changing are breaking in regards to older/newer server/client and in regards to Squirrel API.
       - Older/newer client/server breakage might need to be version gated and should **NOT** be done in patch releases.
       - Squirrel API changes likely breaks mods and should **NOT** be done in patch releases. Additionaly make sure to ping modders on release or preferably even in advance.
-- 
cgit v1.2.3