me/guix
Archived
1
0
Fork 0
Code Activity

doc: contributing: Mention the expected branch merge request format.

Browse source 
* doc/contributing.texi (Managing Patches and Branches): Mention the expected
branch merge request format.
This commit is contained in:
Maxim Cournoyer 2023-08-16 11:44:12 -04:00
parent 2c6fc97959
commit 95e68c1516
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
doc/contributing.texi
View file

@ -1589,10 +1589,21 @@ will automatically show up at
@indicateurl{https://qa.guix.gnu.org/branch/@var{branch}}, with an @indicateurl{https://qa.guix.gnu.org/branch/@var{branch}}, with an
indication of its build status on various platforms. indication of its build status on various platforms.
@cindex feature branches, coordination
To help coordinate the merging of branches, you must create a new 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 guix-patches issue each time you wish to merge a branch (@pxref{The
Issue Tracker}). Normally branches will be merged in a ``first come, Issue Tracker}). The title of the issue requesting to merge a branch
first merged'' manner, tracked through the guix-patches issues. 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 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 this by updating which issues block@footnote{You can mark an issue as