Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add slide about "Trunk-based development" to 01-git #15

Merged
merged 1 commit into from
Oct 6, 2024
Merged

Add slide about "Trunk-based development" to 01-git #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions 01-git/01-git.tex
View file
Open in desktop
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
Loading