From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 16 Mar 2012 21:55:51 +0000 (+0000)
Subject: merge fixes/clarifications - clarify Non-Topbloke merges
X-Git-Tag: f0.2~17
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=c8f8dfbb269c6b57d6fc542b9d3024d356c1e3f2;hp=cdbdcb99ffda2c58f9f41e444cbc385e11cd0ab8;p=topbloke-formulae.git

merge fixes/clarifications - clarify Non-Topbloke merges
---

diff --git a/merge.tex b/merge.tex
index f153811..5555236 100644
--- a/merge.tex
+++ b/merge.tex
@@ -59,7 +59,9 @@ branch without Topbloke's assistance, it is also forbidden to
 merge any Topbloke-controlled branch into any plain git branch.
 
 Given those conditions, Tip Merge and Merge Acyclic do not apply.
-And $Y \not\in \py$ so $\neg [ Y \haspatch \p ]$ so neither
+And by Foreign Contents for Y, $\forall_{\p, D \in \py} D \not\le Y$
+so then by No Replay $D \not\isin Y$
+so $\neg [ Y \haspatch \p ]$ so neither
 Merge Ends condition applies.
 
 So a plain git merge of non-Topbloke branches meets the conditions and