GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2025-02-16 13:40:48 +01:00
Code Issues Projects Releases Wiki Activity

developing: Extra note on branch names

Browse Source
This commit is contained in:
Daniel Oaks 2017-01-18 07:30:48 +10:00
parent 522001d4f6
commit aad7aaba07
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEVELOPING.md
View File

@ -2,6 +2,8 @@
Most development happens on the `develop` branch, which is occasionally rebased + merged into `master` when it's not incredibly broken. When this happens, the `develop` branch is usually pruned until I feel like making 'unsafe' changes again. Most development happens on the `develop` branch, which is occasionally rebased + merged into `master` when it's not incredibly broken. When this happens, the `develop` branch is usually pruned until I feel like making 'unsafe' changes again.
I may also name the branch `develop+feature` if I'm developing multiple, or particularly unstable, features.
The intent is to keep `master` relatively stable. The intent is to keep `master` relatively stable.