Skip to content

Commit 01681d9

Browse files
committed
Update release steps in regards to release branches
based on the fact that we now only create release branches if they are actually necessary
1 parent 7ae1d89 commit 01681d9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

docs/development/releases.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ The process is ever changing in order to simplify it so these steps outlined mig
2727

2828
The current process of making release (includinging release candidate) is:
2929

30-
1. Make release branch (`MAJOR.MINOR.X`) (if not exists)
30+
1. Make release branch (`MAJOR.MINOR.X`) (only if commits need to be cherry-picked)
3131

32-
2. Merge desired commits from `main`
32+
2. Take desired commits from `main`
3333
- Make sure to consider whether changing are breaking in regards to older/newer server/client and in regards to Squirrel API.
3434
- Older/newer client/server breakage might need to be version gated and should **NOT** be done in patch releases.
3535
- 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.

0 commit comments

Comments
 (0)