pseudomerge: commentary about foreign apparently-pseudo merges

[topbloke-formulae.git] / pseudomerge.tex

diff --git a/pseudomerge.tex b/pseudomerge.tex
index 24c05ae..9ea2045 100644 (file)
--- a/pseudomerge.tex
+++ b/pseudomerge.tex
@@ -45,6 +45,11 @@ $\isforeign{D} \implies \big[ D \le C \equiv D \le L \big]$.
 Trivial by Foreign Unaffected and the definition of $\pends$
 }
 
+It might seem that bare git commits might also be psuedo-merges ---
+e.g., merges made directly with {\tt git merge -s ours}.  However, by
+our definition of $\has$, these are considered simply as normal merges
+(\autoref{commit-merge}).
+
 \subsection{No Replay}
 
 Ingredients Prevent Replay applies: