summary refs log tree commit diff
path: root/nix/libutil/affinity.hh
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2023-05-31 09:25:12 +0100
committerChristopher Baines <mail@cbaines.net>2023-06-12 19:52:57 +0100
commit0ea096ae23fa81f05ce97e5e61c15647c0a475ec (patch)
tree1cb6836915009b50a954882a21d1c08fe0e027d5 /nix/libutil/affinity.hh
parent3bea4c0c191e04a37662d2be0ed47ad867b70345 (diff)
downloadguix-0ea096ae23fa81f05ce97e5e61c15647c0a475ec.tar.gz
doc: Move and rewrite the branching strategy.
Move away from using staging and core-updates, and make the strategy
independant of branch names.

Keep the 300 dependent threshold for changes to master, as I don't have any
specific reason to change this.

Most importantly, require using guix-patches issues to coordinate merging of
the branches, as I think that'll address the key issues that have shown up
recently where it's been unclear which branch should be merged next.

* doc/contributing.texi (Submitting Patches): Move the branching strategy to a
new Managing Patches and Branches section.
(Managing Patches and Branches): New section.
(Commit Policy): Simplify through referencing the new Managing Patches and
Branches section.

Signed-off-by: Christopher Baines <mail@cbaines.net>
Diffstat (limited to 'nix/libutil/affinity.hh')
0 files changed, 0 insertions, 0 deletions