aboutsummaryrefslogtreecommitdiff
path: root/docs/development/releases.md
diff options
context:
space:
mode:
authorGeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>2024-09-28 00:05:34 +0200
committerGitHub <noreply@github.com>2024-09-28 00:05:34 +0200
commit933942f89769949ab930d694f9e25cb9801b7e86 (patch)
treeb2c1f59d11b2e16111e4bf7c7604c483079040ea /docs/development/releases.md
parent00e9bb0bf2d75305b91ec60c5f50f562b3f77b2b (diff)
parent6d0ea06301cd3ca62a9babbc1b96edb2772c9d57 (diff)
downloadNorthstarWiki-933942f89769949ab930d694f9e25cb9801b7e86.tar.gz
NorthstarWiki-933942f89769949ab930d694f9e25cb9801b7e86.zip
Merge branch 'main' into docs/gitbook-preprocessordocs/gitbook-preprocessor
Diffstat (limited to 'docs/development/releases.md')
-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.