aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>2024-08-26 15:07:13 +0200
committerGitHub <noreply@github.com>2024-08-26 15:07:13 +0200
commitaf66c6e5964dd076a28fe7897e078fe8707435ed (patch)
tree919a597a8cdcc6c35790382ca88ac61033c8e19d
parent7ae1d8924c0228133e2976102263c495baeb904a (diff)
downloadNorthstarWiki-af66c6e5964dd076a28fe7897e078fe8707435ed.tar.gz
NorthstarWiki-af66c6e5964dd076a28fe7897e078fe8707435ed.zip
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
-rw-r--r--docs/development/releases.md4
1 files changed, 2 insertions, 2 deletions
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.