CONTRIBUTING.md: 20.03
This commit is contained in:
parent
51fcafe779
commit
a045b050dc
4
.github/CONTRIBUTING.md
vendored
4
.github/CONTRIBUTING.md
vendored
@ -53,9 +53,9 @@ For package version upgrades and such a one-line commit message is usually suffi
|
|||||||
To [backport a change into a release branch](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches):
|
To [backport a change into a release branch](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches):
|
||||||
|
|
||||||
1. Take note of the commit in which the change was introduced into `master`.
|
1. Take note of the commit in which the change was introduced into `master`.
|
||||||
2. Check out the target _release branch_, e.g. `release-19.09`. Do not use a _channel branch_ like `nixos-19.09` or `nixpkgs-19.09`.
|
2. Check out the target _release branch_, e.g. `release-20.03`. Do not use a _channel branch_ like `nixos-20.03` or `nixpkgs-20.03`.
|
||||||
3. Use `git cherry-pick -x <original commit>`.
|
3. Use `git cherry-pick -x <original commit>`.
|
||||||
4. Open your backport PR. Make sure to select the release branch (e.g. `release-19.09`) as the target branch of the PR, and link to the PR in which the original change was made to `master`.
|
4. Open your backport PR. Make sure to select the release branch (e.g. `release-20.03`) as the target branch of the PR, and link to the PR in which the original change was made to `master`.
|
||||||
|
|
||||||
## Reviewing contributions
|
## Reviewing contributions
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user