From: Wouter Born <github@maindrain.net>
Date: Sat, 11 Mar 2023 11:26:53 +0000 (+0100)
Subject: Instruct contributors to always use "main" branch for PRs (#14574)
X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=d70e2c62948ce8c65a7cc49c987771f0bee24584;p=openhab-addons.git

Instruct contributors to always use "main" branch for PRs (#14574)

* Instruct contributors to always use "main" branch for PRs
* Fix a typo too

This helps to prevent some frustration between contributors/maintainers.

Signed-off-by: Wouter Born <github@maindrain.net>
---

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 130e6ed3b0..e9817a83a3 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,10 +5,13 @@ Pay attention to the below notes and to *the guidelines* for this repository.
 Feel free to delete any comment sections in the template (starting with "<!--").
 
 ATTENTION: Don't use "git merge" when working with your pull request branch!
-This can clutter your Git history and make your PR unuseable.
+This can clutter your Git history and make your PR unusable.
 Use "git rebase" instead. See this forum post for further details:
 https://community.openhab.org/t/rebase-your-code-or-how-to-fix-your-git-history-before-requesting-a-pull/129358
 
+All PRs should be created using the "main" branch as base.
+Important bugfixes are cherry-picked by maintainers to the patch release branch after a PR has been merged.
+
 Add one or more appropriate labels to make your PR show up in the release notes.
 E.g. enhancement, bug, documentation, new binding
 This can only be done by yourself if you already contributed to this repo.