index : archinstall32 | |
Archlinux32 installer | gitolite user |
summaryrefslogtreecommitdiff |
author | Anton Hvornum <anton@hvornum.se> | 2021-04-27 11:42:05 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-27 11:42:05 +0000 |
commit | 6625f359d01e4f065aca469c2f301a978863c6ef (patch) | |
tree | 83dcb8f735f9fd625a266229568c489741d44d87 /docs/pull_request_template.md | |
parent | ea9d34e8fcd549c2602ced2bdcf13b29e9221817 (diff) | |
parent | 63a597a4fe40a029098aa21ade086eeae6203109 (diff) |
-rw-r--r-- | docs/pull_request_template.md | 18 |
diff --git a/docs/pull_request_template.md b/docs/pull_request_template.md index c2f694ce..729c1aae 100644 --- a/docs/pull_request_template.md +++ b/docs/pull_request_template.md @@ -2,18 +2,8 @@ # 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 *(v2.1.4)* - -Merge against `master` for bug fixes and anything that improves stability and quality of life.<br> -This excludes: - * New functionality - * Added complexity - * Breaking changes - -Any changes to `master` automatically gets pulled in to `torxed-v2.2.0` to avoid merge hell. +All future work towards *`v2.2.0`* is done against `master` now.<br> +Any patch work to existing verions will have to create a new branch against the tagged versions. # Describe your PR @@ -23,6 +13,4 @@ If the PR is larger than ~20 lines, please describe it here unless described in # Testing 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 onto the new ISO* +Please follow the test instructions at the bottom of the README or use the ISO built on each PR.
\ No newline at end of file |