From c8f8dfbb269c6b57d6fc542b9d3024d356c1e3f2 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 16 Mar 2012 21:55:51 +0000 Subject: [PATCH] merge fixes/clarifications - clarify Non-Topbloke merges --- merge.tex | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- 2.30.2