Skip to content

Rename 'master' branch to 'main' in 01-git #34

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

Merged
merged 1 commit into from
Oct 25, 2025
Merged

Rename 'master' branch to 'main' in 01-git #34

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
10 changes: 5 additions & 5 deletions 01-git/01-git.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,9 +326,9 @@ \section{Advanced Git Operations}

\section{Git workflows overview}

\begin{frame}{Push to Master (Linear history approach)}
\begin{frame}{Push to main (Linear history approach)}
\begin{itemize}
\item All changes are made directly to the \texttt{master} branch.
\item All changes are made directly to the \texttt{main} branch.
\item Simplest workflow, suitable for small projects.
\item Potential issues:
\begin{itemize}
Expand All @@ -345,13 +345,13 @@ \section{Git workflows overview}
\begin{itemize}
\item Isolates development work.
\item Facilitates code reviews.
\item Safe integration into \texttt{master} after testing.
\item Safe integration into \texttt{main} after testing.
\end{itemize}
\item Workflow:
\begin{enumerate}
\item Create a new branch: \texttt{git checkout -b <feature-branch>}
\item Develop and commit changes on the feature branch.
\item Merge back into \texttt{master} when ready.
\item Merge back into \texttt{main} when ready.
\end{enumerate}
\end{itemize}
\end{frame}
Expand Down Expand Up @@ -410,7 +410,7 @@ \section{Git workflows overview}
\item A robust branching model for managing releases.
\item Defines specific branches:
\begin{itemize}
\item \textbf{master} --- contains production-ready code.
\item \textbf{main} --- contains production-ready code.
\item \textbf{develop} --- integration branch for features.
\item \textbf{feature branches} --- for new features.
\item \textbf{release branches} --- prepare for a new production release.
Expand Down