File tree 1 file changed +21
-0
lines changed
1 file changed +21
-0
lines changed Original file line number Diff line number Diff line change @@ -283,6 +283,27 @@ \section{Git workflows overview}
283
283
\end {itemize }
284
284
\end {frame }
285
285
286
+ \begin {frame }{Trunk-based development}
287
+ \begin {itemize }
288
+ \item Developers commit directly to the \texttt {trunk } (main branch), avoiding long-lived branches
289
+ \item Encourages continuous integration by integrating small changes frequently
290
+ \item If branches are used, they are short-lived (usually less than a day) and merged back quickly
291
+ \item Use of feature flags is encouraged and allows incomplete features to be safely included in the main codebase
292
+ \item Benefits:
293
+ \begin {itemize }
294
+ \item Reduces merge conflicts and integration problems
295
+ \item Simplifies version control management
296
+ \item Facilitates rapid release cycles and continuous deployment
297
+ \end {itemize }
298
+ \item Drawbacks:
299
+ \begin {itemize }
300
+ \item Requires high discipline from developers to commit stable, working code frequently
301
+ \item Feature flags can become complex to manage, especially if there are many incomplete features
302
+ \item Approach is not suitable for big teams and teams working on long-term
303
+ \end {itemize }
304
+ \end {itemize }
305
+ \end {frame }
306
+
286
307
\begin {frame }{GitHub Flow}
287
308
\begin {itemize }
288
309
\item Lightweight, branch-based workflow suitable for continuous deployment.
You can’t perform that action at this time.
0 commit comments