README.md: Add notes on branches

This commit is contained in:
Haelwenn (lanodan) Monnier 2019-02-10 19:28:33 +01:00
parent 9f515e8064
commit 210a7a578a
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE

View file

@ -12,6 +12,11 @@ This is what you want to do to update the mastofe bundled with pleroma.
- ``git commit -m "update mastofe"``
# Development
## Branches
- `pleroma` branch which merges from `rebase/glitch-soc` once it is stable
- `rebase/glitch-soc`: branch which rebases from upstream, used for testing
- Development branches are targeting `rebase/glitch-soc` and thus can need a frequent rebase
## Tools
- Node.js
- yarn (preferred) or npm