\section{Strategy}
When we are trying to do a merge of some kind, in general,
-we want to merge some commits $S_0 \ldots S_n$.
+we want to merge some source commits $S_0 \ldots S_n$.
We'll write $S_0 = L$. We require that $L$ is the current git ref
for $\patchof{L}$.
-%Let $\set E_{\pc} = \bigcup_i \pendsof{S_i}{\pc}$.
-
\subsection{Notation}
\begin{basedescript}{
This is an acyclic relation, and is the completion of $\succ_1$ into a
partial order.
+\item[ $\set E_{\pc}$ ]
+$ \bigcup_i \pendsof{S_i}{\pc} $.
+All the ends of $\pc$ in the sources.
+
\end{basedescript}
\subsection{Planning phase}
\subsubsection{Planning step for $\pc = \pcn$.}
-FIXME DEFINE $\set E$
-
Choose an (arbitrary, but ideally somehow optimal in
a way not discussed here) ordering of $\set E_{\pc}$, $E_j$ (for
$j = 1 \ldots m$). Remove from that set (and ordering) any $E_j$ which