Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/pull_request_template.md8
1 files changed, 6 insertions, 2 deletions
diff --git a/docs/pull_request_template.md b/docs/pull_request_template.md
index a2b6ff88..ced6fdf1 100644
--- a/docs/pull_request_template.md
+++ b/docs/pull_request_template.md
@@ -1,11 +1,11 @@
🚨 PR Guidelines:
-# New features
+# New features *(v2.2.0)*
Merge new features in to `torxed-v2.2.0`.<br>
This branch is designated for potential breaking changes, added complexity and new functionality.
-# Bug fixes
+# Bug fixes *(v2.1.4)*
Merge against `master` for bug fixes and anything that improves stability and quality of life.<br>
This excludes:
@@ -13,6 +13,8 @@ This excludes:
* Added complexity
* Breaking changes
+Any changes to `master` automatically gets pulled in to `torxed-v2.2.0` to avoid merge hell.
+
# Describe your PR
If the changes has been discussed in an Issue, please tag it so we can backtrace from the Issue later on.<br>
@@ -22,3 +24,5 @@ If the PR is larger than ~20 lines, please describe it here unless described in
Any new feature or stability improvement should be tested if possible.
Please follow the test instructions at the bottom of the README.
+
+*These PR guidelines will change after 2021-05-01, which is when `v2.1.4` gets released*