aboutsummaryrefslogtreecommitdiff
path: root/CONTRIBUTING.org
diff options
context:
space:
mode:
Diffstat (limited to 'CONTRIBUTING.org')
-rw-r--r--CONTRIBUTING.org15
1 files changed, 15 insertions, 0 deletions
diff --git a/CONTRIBUTING.org b/CONTRIBUTING.org
index 669424c..cfcfe86 100644
--- a/CONTRIBUTING.org
+++ b/CONTRIBUTING.org
@@ -29,3 +29,18 @@ To bring something up with the developers, send an email to
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".
+** Making code contributions
+
+If you want to work on a feature, please make a new branch based on
+the relevant release candidate branch and develop your features there.
+
+If the maintainer (me, Colin) has access to your git repo, use the
+mailing list to request that your branch be merged into the relevant
+release candidate branch.
+
+If requesting a merge is infeasible because your git repository is
+private or local to your machine, you may submit a patch against the
+relevant release candidate branch via the mailing list.
+
+
+>>>>>>> develop