summaryrefslogtreecommitdiff
path: root/doc/branching-merging-systems.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'doc/branching-merging-systems.mdwn')
-rw-r--r--doc/branching-merging-systems.mdwn2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/branching-merging-systems.mdwn b/doc/branching-merging-systems.mdwn
index 3e781b5a..3b024cb4 100644
--- a/doc/branching-merging-systems.mdwn
+++ b/doc/branching-merging-systems.mdwn
@@ -1,6 +1,8 @@
Branching and merging at the system level in Baserock
=====================================================
+NOTE: This is a spec. The code does not yet match it.
+
As I write this, Baserock consists of just under 70 upstream projects,
each of which we keep in their own git repository. We need a way to
manage changes to them in a sensible manner, particularly when things