summary refs log tree commit diff
path: root/doc/contributing
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2022-06-14 19:31:34 +0200
committerVladimír Čunát <v@cunat.cz>2022-06-14 19:31:34 +0200
commit7a9920561983f35934bf43b61d101f05a8755fb1 (patch)
treeab8765b4daf56376369e8814d365bbe49260a597 /doc/contributing
parent6616de389ed55fba6eeba60377fc04732d5a207c (diff)
parent50217b01dd68cb4dfc24ecfa568b7f1b69a092cc (diff)
Merge #162960: staging docs: explain that purple arrows are manual
Diffstat (limited to 'doc/contributing')
-rw-r--r--doc/contributing/submitting-changes.chapter.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md
index 6f87e015b9cf3..471e45d7dfb30 100644
--- a/doc/contributing/submitting-changes.chapter.md
+++ b/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}