diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-08-26 07:08:03 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-08-26 07:08:03 +0200 |
| commit | 9d074e16c7a9879d67c348c7b2d70b725adfbdfa (patch) | |
| tree | c4c8dc52508717b3b7aa7c988924a03aa6eb83d8 /doc/contributing.texi | |
| parent | ca7e310f7ac32354b2e693e9a0f783320952a8fc (diff) | |
| parent | eeb71d778f149834015858467fbeeb1276d96d1d (diff) | |
| download | guix-9d074e16c7a9879d67c348c7b2d70b725adfbdfa.tar.gz guix-9d074e16c7a9879d67c348c7b2d70b725adfbdfa.zip | |
Merge branch 'master' into emacs-team
Diffstat (limited to 'doc/contributing.texi')
| -rw-r--r-- | doc/contributing.texi | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/doc/contributing.texi b/doc/contributing.texi index 86fae497f1..69f0327afb 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -1589,10 +1589,21 @@ will automatically show up at @indicateurl{https://qa.guix.gnu.org/branch/@var{branch}}, with an indication of its build status on various platforms. +@cindex feature branches, coordination To help coordinate the merging of branches, you must create a new guix-patches issue each time you wish to merge a branch (@pxref{The -Issue Tracker}). Normally branches will be merged in a ``first come, -first merged'' manner, tracked through the guix-patches issues. +Issue Tracker}). The title of the issue requesting to merge a branch +should have the following format: + +@cindex merge requests, template +@example +Request for merging "@var{name}" branch +@end example + +The @url{https://qa.guix.gnu.org/, QA infrastructure} recognizes such +issues and lists the merge requests on its main page. Normally branches +will be merged in a ``first come, first merged'' manner, tracked through +the guix-patches issues. If you agree on a different order with those involved, you can track this by updating which issues block@footnote{You can mark an issue as |