X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=merge.tex;h=e295d3f4d2dbfb721b240c90ca12960c6eadcf45;hp=555523648032b9548b6eea604d4a9292ff0e3bd2;hb=e9a717cae2df3f857071b1dfb1684d6192966e28;hpb=c8f8dfbb269c6b57d6fc542b9d3024d356c1e3f2 diff --git a/merge.tex b/merge.tex index 5555236..e295d3f 100644 --- a/merge.tex +++ b/merge.tex @@ -59,7 +59,7 @@ 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 by Foreign Contents for Y, $\forall_{\p, D \in \py} D \not\le Y$ +And by Foreign Contents for (wlog) 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.