From d3b82154c687961e6c53e88d3eca0729f632c347 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 18 Mar 2012 10:55:40 +0000 Subject: [PATCH] fix non-topbloke merges empty ends proof --- merge.tex | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/merge.tex b/merge.tex index 2403a49..d9415bc 100644 --- a/merge.tex +++ b/merge.tex @@ -62,8 +62,7 @@ Given those conditions, Tip Merge and Merge Acyclic do not apply. By Foreign Contents of $L$, $\patchof{M} = \bot$ as well. So by Foreign Contents for any $A \in \{L,M,R\}$, $\forall_{\p, D \in \py} D \not\le A$ -so by No Replay for $A$, $D \not\isin A$. -Thus $\pendsof{A}{\py} = \{ \}$ and the RHS of both Merge Ends +so $\pendsof{A}{\py} = \{ \}$ and the RHS of both Merge Ends conditions are satisifed. So a plain git merge of non-Topbloke branches meets the conditions and -- 2.30.2