diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b6d389cd..8248cd8d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -69,7 +69,7 @@ Focus for the foreseeable future is on improving and building on existing functi This is a quick checklist to help streamline the process: -- For **code changes**, make your PR against the [testing branch](https://github.com/tubearchivist/tubearchivist/tree/testing). That's where all active development happens. This simplifies the later merging into *master*, minimizes any conflicts and usually allows for easy and convenient *fast-forward* merging. +- NEW: Make your PR against the [develop branch](https://github.com/tubearchivist/tubearchivist/tree/develop). That's where all active development happens. This simplifies the later merging into *master*, minimizes any conflicts and usually allows for easy and convenient *fast-forward* merging. - Show off your progress, even if not yet complete, by creating a [draft](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests#draft-pull-requests) PR first and switch it as *ready* when you are ready. - Make sure all your code is linted and formatted correctly, see below. @@ -78,7 +78,6 @@ This is a quick checklist to help streamline the process: All documentation is intended to represent the state of the [latest](https://github.com/tubearchivist/tubearchivist/releases/latest) release. - If your PR with code changes also requires changes to documentation *.md files here in this repo, create a separate PR for that, so it can be merged separately at release. -- You can make the PR directly against the *master* branch. - If your PR requires changes on the [tubearchivist/docs](https://github.com/tubearchivist/docs), make the PR over there. - Prepare your documentation updates at the same time as the code changes, so people testing your PR can consult the prepared docs if needed.