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>
This commit is contained in:
Wouter Born 2023-03-11 12:26:53 +01:00 committed by GitHub
parent 75d195465e
commit d70e2c6294
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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 "<!--"). 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! 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: 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 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. Add one or more appropriate labels to make your PR show up in the release notes.
E.g. enhancement, bug, documentation, new binding E.g. enhancement, bug, documentation, new binding
This can only be done by yourself if you already contributed to this repo. This can only be done by yourself if you already contributed to this repo.