Skip to content

Commit 8cb7cd8

Browse files
authored
Merge pull request #2896 from ethancrawford/update_contributing_docs
Docs - update contributing docs again
2 parents 1d1db27 + b54f9b8 commit 8cb7cd8

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

CONTRIBUTING.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ There are several guidelines that we value when planning the format of new work.
2424

2525
Also, regarding the Sonic Pi development process:
2626
- We don't set development deadlines
27-
- We merge code into `main` branch for stable releases only, and all work in progress we merge into `dev` branch
28-
- We want code intended to be merged into the `main` or `dev` branches to be passing all tests where possible
27+
- All work in progress we merge into the `dev` branch. We merge code into the `stable` branch for stable releases.
28+
- We want code intended to be merged into the `dev` or `stable` branches to be passing all tests where possible
2929
- We prefer an issue ticket to be raised as soon as possible when a new bug is discovered (ideally within 48 hours)
30-
- When someone intends to start work on an issue or new feature, they check the [Issues page](https://github.com/sonic-pi-net/sonic-pi/issues) or [the Sonic Pi features project board](https://github.com/orgs/sonic-pi-net/projects/1) first. If the issue or feature is not already being worked on, the person who intends to start it mentions this publicly somewhere, in order to minimise the possibility of duplicated work. (They can do this by updating the issue ticket, or mentioning it in any of the places we gather as a [community](COMMUNITY.md)).
30+
- When someone intends to start work on an issue or new feature:
31+
- They check first that no-one else intends to (or has already done) work on it, via the [Issues page](https://github.com/sonic-pi-net/sonic-pi/issues) or [the Sonic Pi features project board](https://github.com/orgs/sonic-pi-net/projects/1)
32+
- If the issue or feature is freely available for work, the person who intends to start work on it mentions this publically somewhere (for issues, leaving a message on the ticket requesting to be assigned to it, and for new features, mentioning it in any of the places we gather as a [community](COMMUNITY.md))
3133

3234
## Ideal process for contributing with code
3335
1. Familiarise yourself with the part(s) of the code that you wish to contribute towards if necessary. We're always happy to answer questions about the Sonic Pi code!

0 commit comments

Comments
 (0)