Skip to content

Commit e56a068

Browse files
authored
Merge pull request #34 from aobolensk/master-to-main
Rename 'master' branch to 'main' in 01-git
2 parents cc65d30 + 861b732 commit e56a068

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

01-git/01-git.tex

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -326,9 +326,9 @@ \section{Advanced Git Operations}
326326

327327
\section{Git workflows overview}
328328

329-
\begin{frame}{Push to Master (Linear history approach)}
329+
\begin{frame}{Push to main (Linear history approach)}
330330
\begin{itemize}
331-
\item All changes are made directly to the \texttt{master} branch.
331+
\item All changes are made directly to the \texttt{main} branch.
332332
\item Simplest workflow, suitable for small projects.
333333
\item Potential issues:
334334
\begin{itemize}
@@ -345,13 +345,13 @@ \section{Git workflows overview}
345345
\begin{itemize}
346346
\item Isolates development work.
347347
\item Facilitates code reviews.
348-
\item Safe integration into \texttt{master} after testing.
348+
\item Safe integration into \texttt{main} after testing.
349349
\end{itemize}
350350
\item Workflow:
351351
\begin{enumerate}
352352
\item Create a new branch: \texttt{git checkout -b <feature-branch>}
353353
\item Develop and commit changes on the feature branch.
354-
\item Merge back into \texttt{master} when ready.
354+
\item Merge back into \texttt{main} when ready.
355355
\end{enumerate}
356356
\end{itemize}
357357
\end{frame}
@@ -410,7 +410,7 @@ \section{Git workflows overview}
410410
\item A robust branching model for managing releases.
411411
\item Defines specific branches:
412412
\begin{itemize}
413-
\item \textbf{master} --- contains production-ready code.
413+
\item \textbf{main} --- contains production-ready code.
414414
\item \textbf{develop} --- integration branch for features.
415415
\item \textbf{feature branches} --- for new features.
416416
\item \textbf{release branches} --- prepare for a new production release.

0 commit comments

Comments
 (0)