-\section{Strategy}
-
When we are trying to do a merge of some kind, in general,
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}$.
-\subsection{Notation}
+\stdsection{Notation}
\begin{basedescript}{
\desclabelwidth{5em}
\end{basedescript}
-\subsection{Planning phase}
+\section{Planning phase}
We use a recursive planning algorith, recursing over Topbloke commit
sets (ie, sets $\py$ or $\pn$). We'll call the commit set we're
$\pc$.
The sole direct contributor of $\pcy$ is $\pcn$.
-\subsubsection{Planning step for $\pc = \pcn$.}
+\subsection{Planning step for $\pc = \pcn$.}
Choose an (arbitrary, but ideally somehow optimal in
a way not discussed here) ordering of $\set E_{\pc}$, $E_j$ (for