Verified Commit 7632777e authored by Haelwenn's avatar Haelwenn Add notes on branches

parent ddea498d
......@@ -12,6 +12,15 @@ 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
- `master`: Same branch as upstream repository
- `rebase/glitch-soc`: branch which rebases from upstream, used for testing
For developement/Merge Requests I would suggest to use `master` when you are introducing new modifications that cannot be in the upstream, and when you are changing current modifications prefer `rebase/glitch-soc`.
Never use `pleroma` as a base for Merge Requests, it is not meant to be modified directly.
## Tools
- Node.js
- 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