From e75096d634b2f0909be83255eddbdadb148a5620 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 11 Mar 2012 12:34:59 +0000 Subject: [PATCH] anticommit make note re merge base vs merge rhs ordering --- article.tex | 3 +++ 1 file changed, 3 insertions(+) diff --git a/article.tex b/article.tex index 7f55e4f..ec02cee 100644 --- a/article.tex +++ b/article.tex @@ -444,6 +444,9 @@ Used for removing a branch dependency. By Unique Tip, $R^+ \le L$. By definition of $\base$, $R^- \le R^+$ so $R^- \le L$. So $R^+ \le C$ and $R^- \le C$. +(Note that the merge base $R^+ \not\le R^-$, i.e. the merge base is +later than one of the branches to be merged.) + \subsection{No Replay} No Replay for Merge Results applies. $\qed$ -- 2.30.2