From bc9cf8580703d1c759d92303213657613c8d5340 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Thu, 24 Apr 2025 02:05:17 +0000 Subject: [PATCH] Add note about branch policy. [ci skip] Fix contributing doc reference. Signed-off-by: Jason Volk --- CONTRIBUTING.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1c0971ba..13714c91 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -134,8 +134,19 @@ Contribution by users who violate either of these code of conducts will not have their contributions accepted. This includes users who have been banned from conduwuit Matrix rooms for Code of Conduct violations. +### Branch Policy + +##### This section applies to Matrix-Construct members and Tuwunel maintainers + +All branches on the matrix-construct/tuwunel repository are _centrally +maintained_. They may be rebased without your consent. Trivial conflicts may be +resolved by another maintainer. Please resolve more difficult conflicts as soon +as possible. Personal forks are advised to reduce the workload on other +maintainers. Stale branches will be deleted to reduce the effort for this +policy. + [issues]: https://github.com/matrix-construct/tuwunel/issues -[conduwuit-matrix]: https://matrix.to/#/#tuwunel:tuwunel.chat +[tuwunel-chat]: https://matrix.to/#/#tuwunel:tuwunel.chat [complement]: https://github.com/matrix-org/complement/ [engage.toml]: https://github.com/matrix-construct/tuwunel/blob/main/engage.toml [engage]: https://charles.page.computer.surgery/engage/