mirror of
https://github.com/ergochat/ergo.git
synced 2025-12-20 10:10:08 -08:00
developing: Extra note on branch names
This commit is contained in:
parent
522001d4f6
commit
aad7aaba07
1 changed files with 2 additions and 0 deletions
|
|
@ -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.
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue