Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
mastofe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
KokaKiwi
mastofe
Commits
b536bd75
Verified
Commit
b536bd75
authored
6 years ago
by
Haelwenn
Browse files
Options
Downloads
Patches
Plain Diff
README.md: Add notes on branches
parent
e63ba797
No related branches found
Branches containing commit
Tags
v2.4.2
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
README.md
+5
-0
5 additions, 0 deletions
README.md
with
5 additions
and
0 deletions
README.md
+
5
−
0
View file @
b536bd75
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment