Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce to only one release branch

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2024-04-09 18:23:43 +02:00
parent 4d877d411b
commit 5d3a5a335f
6 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CONTRIBUTING.md
+6 -7
View File
@@ -22,14 +22,13 @@ just make a pull request directly.
## Picking the Correct Branch for a Pull Request
As of April 2024, pre-releases and point releases (like 2.x) are made from the `main` branch. The
`main` branch is the default branch. For general changes, please make a new branch in your own fork
from the current `main` branch. Do not make pull requests from your copy of the `main` branch.
The `main` branch is the default branch. For general changes, please make a new branch in your own
fork from the current `main` branch. Do not make pull requests from your copy of the `main` branch.
If you are submitting a fix to a current release, say 2.4, you must do so from the correct release
branch. For 2.4 this is `releases/v2.4`. If you make such a fix on the `main` branch, **it cannot
be included in a 2.4.x release**. This also applies to the current documentation published on the
main website.
As of April 2024, releases are made from the `release` branch. If you are submitting a fix to a
current release you must do so from the `release` branch. If you make such a fix on the `main`
branch, **it cannot be included in a patch release**. This also applies to the documentation for
the latest release published on the main website.
**Also check the following:**