From b95e2597428bccba4c4174896943de6eb5508886 Mon Sep 17 00:00:00 2001 From: Max Logaev Date: Thu, 20 Mar 2025 03:33:52 +0300 Subject: [PATCH] CONTIBUTING.md: Added multiple authors --- CONTRIBUTING.md | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 634f30289..e410e575f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -43,18 +43,29 @@ Commit message body, if needed ``` - Commit message header and body should reflect changes made in commit -- Commit message header should start with a capital letter - Commit message body should be separated from the header by one empty line ### Length Maximum number of characters in a commit header is **72** (standard for **Git**). Also, **72** is the maximum length of a line in a commit body. -## Merge commits +### Multiple authors + +If you are making a commit together with another developer, you need to add: + +``` +Co-authored-by: ANOTHER-NAME +``` + +to the end commit message body on a new line. + +### Merge commits > [!WARNING] > Merge commits are **prohibited** in the project +Use **rebase** to keep your branch up to date. + ## Conclusion We hope this small instructions will help you to get familiar with KolibriOS contribution rules and inspire you to participate in the work of this project.