merge fixes/clarifications - clarify Non-Topbloke merges - add a wlog

[topbloke-formulae.git] / merge.tex

diff --git a/merge.tex b/merge.tex
index 5e6dfdcc885879c0c036f6aafd28df9e6f5fc464..e295d3f4d2dbfb721b240c90ca12960c6eadcf45 100644 (file)
--- a/merge.tex
+++ b/merge.tex
@@ -15,7 +15,7 @@ $L \in \pn$, $R \in \pry$, $M = \baseof{R}$.
 
 \subsection{Conditions}
 \[ \eqn{ Ingredients }{
- M \le L, M \le R
+ M \le L \land M \le R
 }\]
 \[ \eqn{ Tip Merge }{
  L \in \py \implies
@@ -47,7 +47,7 @@ $L \in \pn$, $R \in \pry$, $M = \baseof{R}$.
    \right]
 }\]
 \[ \eqn{ Foreign Merges }{
-    \patchof{L} = \bot \equiv \patchof{R} = \bot
+    \patchof{L} = \bot \implies \patchof{R} = \bot
 }\]
 
 \subsection{Non-Topbloke merges}
@@ -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 (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.
 
 So a plain git merge of non-Topbloke branches meets the conditions and