twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-07-26 01:32:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update branch name references

Browse Source
This commit is contained in:
Nassim Jahnke
2024-12-21 14:03:02 +01:00
parent 7490b311ff
commit fd4c10947f
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CONTRIBUTING.md
View File

@@ -185,11 +185,11 @@ need to "save" the changes.
## Rebasing PRs
Steps to rebase a PR to include the latest changes from `master`.
Steps to rebase a PR to include the latest changes from `main`.
These steps assume the `origin` remote is your fork of this repository and `upstream` is the official PaperMC repository.
1. Pull the latest changes from upstreams master: `git switch main && git pull upstream main`.
1. Checkout feature/fix branch and rebase on master: `git checkout patch-branch && git rebase main`.
1. Pull the latest changes from upstreams main: `git switch main && git pull upstream main`.
1. Checkout feature/fix branch and rebase on main: `git checkout patch-branch && git rebase main`.
1. Apply updated patches: `./gradlew applyPatches`.
1. If there are conflicts, fix them.
1. If your PR creates new feature patches instead of modifying existing ones, ensure your newly-created patch is the last commit by either: