From aad7aaba07018dc196767c2cd9fef19bb02902f7 Mon Sep 17 00:00:00 2001 From: Daniel Oaks Date: Wed, 18 Jan 2017 07:30:48 +1000 Subject: [PATCH] developing: Extra note on branch names --- DEVELOPING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPING.md b/DEVELOPING.md index 0fc207fb..ffa706e9 100644 --- a/DEVELOPING.md +++ b/DEVELOPING.md @@ -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. +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.