Skip to content

Commit 657a404

Browse files
authoredSep 9, 2020
CONTRIBUTING.md: bump backport example
1 parent 1186c16 commit 657a404

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed
 

‎.github/CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ For package version upgrades and such a one-line commit message is usually suffi
5353
Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches).
5454

5555
1. Take note of the commits in which the change was introduced into `master` branch.
56-
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`.
56+
2. Check out the target _release branch_, e.g. `release-20.09`. Do not use a _channel branch_ like ~`nixos-20.09`~ or ~`nixpkgs-20.09`~.
5757
3. Create a branch for your change, e.g. `git checkout -b backport`.
5858
4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe <original commit>` and add a reason. Otherwise use `git cherry-pick -x <original commit>`. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar.
59-
5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.03`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.03]`.
59+
5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.09`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.09]`.
6060

6161
## Reviewing contributions
6262

0 commit comments

Comments
 (0)