Verified Commit b536bd75 authored by Haelwenn's avatar Haelwenn

README.md: Add notes on branches

parent e63ba797
...@@ -12,6 +12,11 @@ This is what you want to do to update the mastofe bundled with pleroma. ...@@ -12,6 +12,11 @@ This is what you want to do to update the mastofe bundled with pleroma.
- ``git commit -m "update mastofe"`` - ``git commit -m "update mastofe"``
# Development # 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 ## Tools
- Node.js - Node.js
- yarn (preferred) or npm - yarn (preferred) or npm
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment