From e07304067e8d4695c20978c6479fc0e18c184de0 Mon Sep 17 00:00:00 2001 From: ThinaticSystem Date: Fri, 1 Apr 2022 17:28:55 +0900 Subject: [PATCH] =?UTF-8?q?=E2=98=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CONTRIBUTING.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6e0f500be..63c11138c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,8 +23,10 @@ Also, when you start implementation, assign yourself to the Issue (if you cannot ## Well-known branches - **`master`** branch is tracking the latest release and used for production purposes. -- **`develop`** branch is where we work for the next release. +- **`honi-dev`** branch is where we work for the next release. - When you create a PR, basically target it to this branch. +- **`develop`** branch is where original misskey team work for the next release. + - You **must not** target your PR to this branch. - **`l10n_develop`** branch is reserved for localization management. ## Creating a PR