Commit 9dd416ac authored by Haelwenn's avatar Haelwenn
Browse files

Merge branch 'docs/branch-target' into 'rebase/glitch-soc' Add `master` branch usage, try a cleaner way to do MRs

See merge request !19
parents 0f44cff3 a8d713dc
Pipeline #8463 passed with stage
in 3 minutes and 26 seconds
......@@ -14,8 +14,12 @@ This is what you want to do to update the mastofe bundled with pleroma.
# 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
- Development branches are targeting `rebase/glitch-soc` and thus can need a frequent rebase
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
Supports Markdown
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