From 95e68c15165e4754a617b84c0512bab76df93c15 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 16 Aug 2023 11:44:12 -0400 Subject: doc: contributing: Mention the expected branch merge request format. * doc/contributing.texi (Managing Patches and Branches): Mention the expected branch merge request format. --- doc/contributing.texi | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'doc') 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 -- cgit v1.2.3