diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2020-09-09 23:06:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-09 23:06:38 +0200 |
| commit | 657a404088dad703bd419581b143b41b5a5df75a (patch) | |
| tree | 2fdac1c9df04c7680be8ac2b0a36691d40c8ea67 | |
| parent | pass-wayland: use proper derivation for `.withExtensions` (diff) | |
| download | nixpkgs-origin/contributing-bump-examples.tar.gz | |
CONTRIBUTING.md: bump backport exampleorigin/contributing-bump-examples
| -rw-r--r-- | .github/CONTRIBUTING.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index cb0264b0167f..de6d28ba584b 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -53,10 +53,10 @@ For package version upgrades and such a one-line commit message is usually suffi 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). 1. Take note of the commits in which the change was introduced into `master` branch. -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`. +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`~. 3. Create a branch for your change, e.g. `git checkout -b backport`. 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. -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]`. +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]`. ## Reviewing contributions |