pseudomerge: commentary about foreign apparently-pseudo merges

diff --git a/article.tex b/article.tex
index 2ee37593eaec32d49957386b6721ab1fc1c68880..b37f9a59d32379b3d99d30e622cf1256b058b499 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -7,6 +7,7 @@
 \usepackage{amsfonts}
 \usepackage{eufrak}
 \usepackage{mdwlist}
 \usepackage{amsfonts}
 \usepackage{eufrak}
 \usepackage{mdwlist}

+\usepackage{hyperref}

 %\usepackage{lastpage}
 %\usepackage{accents}
 
 %\usepackage{lastpage}
 %\usepackage{accents}
 

diff --git a/merge.tex b/merge.tex
index 5bb0db2b79feffdd0be6452064c36c631b65385a..881dd249cce6b73a0a97e83b6173383af844c3df 100644 (file)
--- a/merge.tex
+++ b/merge.tex
@@ -1,4 +1,5 @@
 \section{Merge}
 \section{Merge}

+\label{commit-merge}

 
 Merge commits $L$ and $R$ using merge base $M$:
 \gathbegin
 
 Merge commits $L$ and $R$ using merge base $M$:
 \gathbegin

diff --git a/pseudomerge.tex b/pseudomerge.tex
index 24c05ae68efa63266b20eb3d37dc6b4fce786a1c..9ea20452abed952f324ac3a32e9e6ade913de286 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$
 }
 
 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:
 \subsection{No Replay}
 
 Ingredients Prevent Replay applies: