Skip to content

Commit cdec42f

Browse files
committed
Update CONTRIBUTING.md
1 parent df3c3a3 commit cdec42f

File tree

32 files changed

+20
-0
lines changed

32 files changed

+20
-0
lines changed

CONTRIBUTING.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,26 @@ and your server.
192192
While we will fix minor formatting issues, you should stick to the guide below
193193
when making and submitting changes.
194194

195+
### Branches and Minecraft Versions
196+
197+
Generally, PRs should be targeted at the `main` branch, where active development for
198+
the latest Minecraft release happens.
199+
200+
If a new Minecraft release is imminent, it may be wise to wait until it's released
201+
and merged to `main` to avoid having to rebase your PR, as the `main` branch will be
202+
frozen during this time (you can ask in the Paper Discord if you're unsure).
203+
204+
For old Minecraft versions - we are unlikely to accept PRs targeting any versions not
205+
marked as supported at https://fill-ui.papermc.io/projects/paper.
206+
207+
For snapshots and other pre-release versions - you should only target these branches
208+
for changes specific to features or changes in those versions. For example, if Copper
209+
Golem is going to be added in 1.21.9, you can PR to the relevant dev branch as it would
210+
not make sense to merge that into `main`. Or, if you are fixing a bug that only exists in
211+
a dev branch, you should target that branch. When submitting PRs to dev branches, please
212+
coordinate with the dev team in Discord or open an issue before starting work to ensure
213+
it's an area we want to accept changes for.
214+
195215
## Formatting
196216

197217
All modifications to Vanilla files should be marked. For historical reasons,

0 commit comments

Comments
 (0)