Skip to content

Commit

Permalink
Add slide about "Trunk-based development" to 01-git
Browse files Browse the repository at this point in the history
  • Loading branch information
aobolensk committed Oct 6, 2024
1 parent d8766d9 commit 6b05d83
Showing 1 changed file with 21 additions and 0 deletions.
21 changes: 21 additions & 0 deletions 01-git/01-git.tex
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,27 @@ \section{Git workflows overview}
\end{itemize}
\end{frame}

\begin{frame}{Trunk-based development}
\begin{itemize}
\item Developers commit directly to the \texttt{trunk} (main branch), avoiding long-lived branches
\item Encourages continuous integration by integrating small changes frequently
\item If branches are used, they are short-lived (usually less than a day) and merged back quickly
\item Use of feature flags is encouraged and allows incomplete features to be safely included in the main codebase
\item Benefits:
\begin{itemize}
\item Reduces merge conflicts and integration problems
\item Simplifies version control management
\item Facilitates rapid release cycles and continuous deployment
\end{itemize}
\item Drawbacks:
\begin{itemize}
\item Requires high discipline from developers to commit stable, working code frequently
\item Feature flags can become complex to manage, especially if there are many incomplete features
\item Approach is not suitable for big teams and teams working on long-term
\end{itemize}
\end{itemize}
\end{frame}

\begin{frame}{GitHub Flow}
\begin{itemize}
\item Lightweight, branch-based workflow suitable for continuous deployment.
Expand Down

0 comments on commit 6b05d83

Please sign in to comment.