diff options
| author | 宋文武 <iyzsong@member.fsf.org> | 2023-08-17 18:38:23 +0800 |
|---|---|---|
| committer | 宋文武 <iyzsong@member.fsf.org> | 2023-08-17 18:38:23 +0800 |
| commit | 0ffbdf34567aedb0ae6cef6b869370a415cfaa65 (patch) | |
| tree | 76425d441657ffbc6cfe996144cda706eb997a12 /doc/contributing.texi | |
| parent | d9320de5aa9b77adf5fa31c6429ec8eb08c24458 (diff) | |
| parent | 1b2d43fe016848ea2ec16ff18cbc14340944fc4e (diff) | |
| download | guix-0ffbdf34567aedb0ae6cef6b869370a415cfaa65.tar.gz guix-0ffbdf34567aedb0ae6cef6b869370a415cfaa65.zip | |
Merge remote-tracking branch 'origin/master' into kde-updates
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 |