diff options
| author | Colin Okay <okay@toyful.space> | 2022-03-05 18:11:25 -0600 |
|---|---|---|
| committer | Colin Okay <okay@toyful.space> | 2022-03-05 18:11:25 -0600 |
| commit | 0b9c364c4b6c73f5e1a6cfb0069288b2736fb1ee (patch) | |
| tree | 967af9b083ec5866ad1ba8622c92a16f2ed7bf6f | |
| parent | d8376d1bd717181892e339a6ca42be83b7ffae66 (diff) | |
| parent | 72978b2739038bf3525c08abe92d55e61aba719e (diff) | |
Merge branch 'main' into rc-alpha-0.6
| -rw-r--r-- | CONTRIBUTING.org | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/CONTRIBUTING.org b/CONTRIBUTING.org index c242b1d..9d896ee 100644 --- a/CONTRIBUTING.org +++ b/CONTRIBUTING.org @@ -9,13 +9,8 @@ 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. -These branches are based off of the dev branch, meaning that any one -of them should be able to merge dev at any point - merge conflicts -from dev into an rc branch are not allowed. - When a release candidate is "accepted", it will be merged into main -and the commit will be tagged with the version. At that point dev -should also be updated from main. +and the commit will be tagged with the version. ** Suggesting Features & Reporting Bugs @@ -34,7 +29,7 @@ by starting the subject line with one of the following: ** Branch based collaboration If you want to work on a feature, please make a new branch based on -dev and develop your features there. +the relevant release candidate branch and develop your features there. If the maintainer (me, Colin) has access to your git repo, simply request that your branch be merged into the relevant release candidate |