# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@octave.org>
# Date 1394411524 14400
# Node ID 95b79f82a2007c0231242208b774050409d7426f
# Parent  756d0a23f1a5454197cf4dce4464a0f3002b610e
Add summary of final points

diff -r 756d0a23f1a5 -r 95b79f82a200 talk.tex
--- a/talk.tex	Sun Mar 09 20:31:29 2014 -0400
+++ b/talk.tex	Sun Mar 09 20:32:04 2014 -0400
@@ -322,6 +322,34 @@
     \fontsize{68}{80}\selectfont \lefthand
   \end{center}
 \end{frame}
-  
+
+\begin{frame}
+  {\Large \textbf{Evolve's solutions}}
+  \begin{enumerate}
+    \item Recovering from upstream rewrite (rebase)
+    \pause
+    \begin{itemize}
+      \item \emph{Solution}: \texttt{hg evolve}
+    \end{itemize}
+    \pause
+    \item Some commits are historical record, should not be rewritten
+    \pause
+    \begin{itemize}
+      \item \emph{Solution}: Public and draft phases
+    \end{itemize}
+    \pause
+    \item Safely sharing rewritten commits with remote repos
+    \pause
+    \begin{itemize}
+      \item \emph{Solution}: Obsolescence markers
+    \end{itemize}
+  \end{enumerate}
+\end{frame}
+
+\begin{frame}
+  \begin{center}
+    \fontsize{58}{70}\selectfont Questions?
+  \end{center}
+\end{frame}
 
 \end{document}
\ No newline at end of file