Merge #162960: staging docs: explain that purple arrows are manual

main
Vladimír Čunát 2 years ago
commit 7a99205619
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
  1. 2
      doc/contributing/submitting-changes.chapter.md

@ -227,7 +227,7 @@ digraph {
}
```
[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/periodic-merge-6h.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours.
[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/periodic-merge-6h.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours; these are the blue arrows in the diagram above. The purple arrows in the diagram above are done manually and much less frequently. You can get an idea of how often these merges occur by looking at the git history.
### Master branch {#submitting-changes-master-branch}

Loading…
Cancel
Save