\forall_{E \in \pendsof{K}{\py}} T \ge E
, \text{where} \{J,K\} = \{L,R\}
}\]
-\[ \eqn{ Foreign Merges }{
+\[ \eqn{ Foreign Merge }{
\isforeign{L} \implies \isforeign{R}
}\]
\subsection{Non-Topbloke merges}
We require both $\isforeign{L}$ and $\isforeign{R}$
-(Foreign Merges, above).
+(Foreign Merge, above).
I.e. not only is it forbidden to merge into a Topbloke-controlled
branch without Topbloke's assistance, it is also forbidden to
merge any Topbloke-controlled branch into any plain git branch.
\subsection{Coherence and Patch Inclusion}
+$C$ satisfies
+\gathbegin
+ C \haspatch \p \lor C \nothaspatch \p
+\gathnext
+C \haspatch \p \equiv
+ \stmtmergeof{L \haspatch \p}{M \haspatch \p}{R \haspatch \p}
+\end{gather}
+which (given Coherence of $L$,$M$,$R$) is equivalent to
$$
\begin{cases}
L \nothaspatch \p \land R \nothaspatch \p : & C \nothaspatch \p \\
$D \not\isin L \land D \not\isin R$. $C \not\in \py$ (otherwise $L
\in \py$ ie $L \haspatch \p$ by Tip Own Contents for $L$).
So $D \neq C$.
-Applying \commitmergename gives $D \not\isin C$ i.e. $C \nothaspatch \p$.
+Applying \commitmergename\ gives $D \not\isin C$ i.e. $C \nothaspatch \p$.
OK.
\subsubsection{For $L \haspatch \p, R \haspatch \p$:}
\subsection{Foreign Ancestry}
Only relevant if $\isforeign{L}$, in which case
-$\isforeign{C}$ and by Foreign Merges $\isforeign{R}$,
+$\isforeign{C}$ and by Foreign Merge $\isforeign{R}$,
so Totally Foreign Ancestry applies. $\qed$
\subsection{Bases' Children}
Other possibilities for $L \in \pn$ are excluded by Base Merge.
-If $L \in \foreign$: not applicable for $L$; nor for $R$, by Foreign Merges.
+If $L \in \foreign$: not applicable for $L$; nor for $R$, by Foreign Merge.
+$\qed$