wip more merge driver

[topbloke.git] / DESIGN

diff --git a/DESIGN b/DESIGN
index 23d5a16f77e2c8e25bbcf5a8196b15e6aee82876..f68272b1331daefe158f31cd6db36e9c0a639a63 100644 (file)
--- a/DESIGN
+++ b/DESIGN
@@ -143,6 +143,13 @@ Branch removal:
  undeleting
    - just unmark the branch as deleted
 
+
+Foreign branches:
+ When merging from a foreign dependency, check that it
+ does not have .topbloke/included or .topbloke/flags; if it
+ does, could produce a new commit which has .topbloke removed
+ and merge from that
+
 Branch naming:
  needs to be globally unique
  so put email address in it