diff options
| -rw-r--r-- | .github/workflows/close_invalid_prs.yml | 10 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 6 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | settings.gradle.kts | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/.github/workflows/close_invalid_prs.yml b/.github/workflows/close_invalid_prs.yml index ef572c25c8..52ac0c1769 100644 --- a/.github/workflows/close_invalid_prs.yml +++ b/.github/workflows/close_invalid_prs.yml @@ -9,19 +9,19 @@ jobs: if: | github.repository != github.event.pull_request.head.repo.full_name && ( - github.head_ref == 'master' || + github.head_ref == 'main' || github.event.pull_request.head.repo.owner.type != 'User' ) runs-on: ubuntu-latest steps: - uses: superbrothers/close-pull-request@v3 - id: "master_branch" - if: github.head_ref == 'master' + id: "main_branch" + if: github.head_ref == 'main' with: - comment: "Please do not open pull requests from the `master` branch, create a new branch instead." + comment: "Please do not open pull requests from the `main` branch, create a new branch instead." - uses: superbrothers/close-pull-request@v3 id: "org_account" - if: github.event.pull_request.head.repo.owner.type != 'User' && steps.master_branch.outcome == 'skipped' + if: github.event.pull_request.head.repo.owner.type != 'User' && steps.main_branch.outcome == 'skipped' with: comment: "Please do not open pull requests from non-user accounts like organizations. Create a fork on a user account instead." diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 38fb143438..74421624b1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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: @@ -1,4 +1,4 @@ -Paper [](https://github.com/PaperMC/Paper/actions) +Paper [](https://github.com/PaperMC/Paper/actions) [](https://discord.gg/papermc) [](https://github.com/sponsors/PaperMC) [](https://opencollective.com/papermc) diff --git a/settings.gradle.kts b/settings.gradle.kts index 9503dfc6a6..2e832ab34f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -24,7 +24,7 @@ if (!file(".git").exists()) { Built Paper jars are available for download at https://papermc.io/downloads/paper - See https://github.com/PaperMC/Paper/blob/master/CONTRIBUTING.md + See https://github.com/PaperMC/Paper/blob/main/CONTRIBUTING.md for further information on building and modifying Paper. =================================================== """.trimIndent() |