aboutsummaryrefslogtreecommitdiff
path: root/CONTRIBUTING.org
diff options
context:
space:
mode:
Diffstat (limited to 'CONTRIBUTING.org')
-rw-r--r--CONTRIBUTING.org33
1 files changed, 17 insertions, 16 deletions
diff --git a/CONTRIBUTING.org b/CONTRIBUTING.org
index 2641f74..cfcfe86 100644
--- a/CONTRIBUTING.org
+++ b/CONTRIBUTING.org
@@ -6,29 +6,29 @@ Prior to 1.0.0, there will be a weekly release each Friday.
After 1.0.0, a new release schedule will be decided upon.
-Each release is developed in a branch called rc-<major>.<minor>,
-referring to the major and minor versions in semver.
+At any moment, there are three branches:
+
+| BRANCH | PURPOSE |
+|---------+-----------------------------------------------------------------|
+| main | Where stable releases reside. Each taggged with a version. |
+|---------+-----------------------------------------------------------------|
+| rc | The release candidate branch. Courageous may build and test the |
+| | this branch prior to its release. Bugfix patches and PRs |
+| | are submitted to rc. |
+|---------+-----------------------------------------------------------------|
+| develop | Where new features are actively developed. |
+|---------+-----------------------------------------------------------------|
-When a release candidate is "accepted", it will be merged into main
-and the commit will be tagged with the version.
** Suggesting Features & Reporting Bugs
+To bring something up with the developers, send an email to
+
+ ~cbeo/oneliners.wiki@lists.sr.ht
+
To keep up with developments and discuss this tool, join the mailing
list by visiting https://lists.sr.ht/~cbeo/oneliners.wiki and hitting
"subscribe".
-
-As a convenience to the maintainer(s), please categorize your message
-by starting the subject line with one of the following:
-
-- [FEATURE CLI] For feature requests
-- [ISSUE CLI] For issue / bug reports
-- [PATCH vN] For patches (use git send-email)
-- [GENERAL CLI] For anything else
-
-ADDITIONALLY, you may post general issues and bugreports here:
-https://todo.sr.ht/~cbeo/oneliners.wiki
-
** Making code contributions
If you want to work on a feature, please make a new branch based on
@@ -43,3 +43,4 @@ private or local to your machine, you may submit a patch against the
relevant release candidate branch via the mailing list.
+>>>>>>> develop