diff options
| author | Matthias C. M. Troffaes <matthias.troffaes@gmail.com> | 2015-12-07 08:49:04 +0000 |
|---|---|---|
| committer | Matthias C. M. Troffaes <matthias.troffaes@gmail.com> | 2015-12-07 08:49:04 +0000 |
| commit | e6046739cd8dbc999c507ccced64d1990d8b35ec (patch) | |
| tree | 3908cb0e0fff8010428cc28e7002d4d178ea94bc /doc/submitting-changes.xml | |
| parent | f6754747bdf9582807c5e0efb8127885eef762e3 (diff) | |
| download | nixlib-e6046739cd8dbc999c507ccced64d1990d8b35ec.tar nixlib-e6046739cd8dbc999c507ccced64d1990d8b35ec.tar.gz nixlib-e6046739cd8dbc999c507ccced64d1990d8b35ec.tar.bz2 nixlib-e6046739cd8dbc999c507ccced64d1990d8b35ec.tar.lz nixlib-e6046739cd8dbc999c507ccced64d1990d8b35ec.tar.xz nixlib-e6046739cd8dbc999c507ccced64d1990d8b35ec.tar.zst nixlib-e6046739cd8dbc999c507ccced64d1990d8b35ec.zip | |
doc/submitting-changes: mention master -> staging merge (see issue #11460)
Diffstat (limited to 'doc/submitting-changes.xml')
| -rw-r--r-- | doc/submitting-changes.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml index fe331d082506..0fd1954c528b 100644 --- a/doc/submitting-changes.xml +++ b/doc/submitting-changes.xml @@ -270,7 +270,7 @@ Additional information. </listitem> <listitem> -<para>If staging is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days, merge into master, then resume development on staging. <link xlink:href="http://hydra.nixos.org/jobset/nixpkgs/staging#tabs-evaluations">Keep an eye on the staging evaluations here</link>.</para> +<para>If staging is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days, merge into master, then resume development on staging. <link xlink:href="http://hydra.nixos.org/jobset/nixpkgs/staging#tabs-evaluations">Keep an eye on the staging evaluations here</link>. If any fixes for staging happen to be already in master, then master can be merged into staging.</para> </listitem> <listitem> |