From 90f28e1e86582d20f1ea362129b414210d279e17 Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Tue, 14 Apr 2015 10:01:01 -0500 Subject: [PATCH] init --- Branches.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Branches.md diff --git a/Branches.md b/Branches.md new file mode 100644 index 0000000..1e268d4 --- /dev/null +++ b/Branches.md @@ -0,0 +1,7 @@ +* `master` + * The basis for the `1.y.z` series (e.g. `1.6.2`). +* `0.y.z` + * The basis for the `0.y.z` series (e.g. `0.10.2`). + * `master` will be repeatedly *merged* into this. (In the past, we rebased this onto master.) +* `private-0.y.z` + * A private branch, repeatedly *rebased* to `master`. This will always match `0.y.z`, but with a much cleaner history. It helps us to avoid merge mistakes. \ No newline at end of file