Commit 00bc55f2 authored by Kronberg, V.C.E.'s avatar Kronberg, V.C.E.
Browse files

Merge branch 'sceMaster'

parents 2d52a455 30b9fbe3
...@@ -50,4 +50,4 @@ Tutorial.out ...@@ -50,4 +50,4 @@ Tutorial.out
/Git_Workshop.snm /Git_Workshop.snm
/Git_Workshop.synctex.gz /Git_Workshop.synctex.gz
/Git_Workshop.toc /Git_Workshop.toc
*.fls /Git_Workshop.fls
...@@ -89,6 +89,15 @@ Download SmartGit: \url{https://www.syntevo.com/smartgit/}}{} ...@@ -89,6 +89,15 @@ Download SmartGit: \url{https://www.syntevo.com/smartgit/}}{}
\includegraphics[width=0.9\textwidth]{Figs/gitbranches_votca.png} \includegraphics[width=0.9\textwidth]{Figs/gitbranches_votca.png}
\end{frame} \end{frame}
\begin{frame}
\frametitle{Version Control for Jupyter Notebooks}
\begin{itemize}
\item Regular git (and thus SmartGit) yields incomprehensible diffs of Jupyter Notebooks.
\item This makes it difficult to merge and collaborate.
\item The solution is to make use of \texttt{nbdime}, which can be integrated into the command-line version of git: \url{https://nbdime.readthedocs.io/}.
\item This utility was developed as part of the OpenDreamKit project, and the specific scenario of collaborating with Jupyter notebooks is covered here: \url{https://opendreamkit.org/2019/10/24/rtc/}.
\end{itemize}
\end{frame}
\end{document} \end{document}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment