Skip to content
Snippets Groups Projects
Unverified Commit 5db2a59a authored by Richard van der Hoff's avatar Richard van der Hoff Committed by GitHub
Browse files

Update CONTRIBUTING.md (#7541)

parent b2b86990
No related branches found
No related tags found
No related merge requests found
...@@ -16,21 +16,10 @@ project on github, and then [create a pull request]( ...@@ -16,21 +16,10 @@ project on github, and then [create a pull request](
https://help.github.com/articles/using-pull-requests/) to ask us to pull your https://help.github.com/articles/using-pull-requests/) to ask us to pull your
changes into our repo. changes into our repo.
**The single biggest thing you need to know is: please base your changes on Some other points to follow:
the develop branch - *not* master.**
* Please base your changes on the `develop` branch.
We use the master branch to track the most recent release, so that folks who
blindly clone the repo and automatically check out master get something that
works. Develop is the unstable branch where all the development actually
happens: the workflow is that contributors should fork the develop branch to
make a 'feature' branch for a particular contribution, and then make a pull
request to merge this back into the matrix.org 'official' develop branch. We
use github's pull request workflow to review the contribution, and either ask
you to make any refinements needed or merge it and make them ourselves. The
changes will then land on master when we next do a release.
Some other things you will need to know when contributing to Synapse:
* Please follow the [code style requirements](#code-style). * Please follow the [code style requirements](#code-style).
* Please include a [changelog entry](#changelog) with each PR. * Please include a [changelog entry](#changelog) with each PR.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment