From the course: Designing and Implementing Source Control using GitHub and Azure DevOps
Unlock this course with a free trial
Join today to access over 25,500 courses taught by industry experts.
Git branching strategies
From the course: Designing and Implementing Source Control using GitHub and Azure DevOps
Git branching strategies
- [Instructor] As more people start working on the same code base, it can become challenging to manage the changes. That's where Git branching strategies come in. So let's talk about two Git branching strategies and why we would use one and not the other. We start with the Git flow. This is a popular branching strategy that is widely used in software development. It is based on two main branches, the master branch and the development branch. The master branch is used for production-ready code, while the development branch is used for ongoing development. Feature branches are created from the development branch for individual features or bugfixes. Once the feature is complete, it is merged into the development branch. The pros of Git flow include a clear separation of code ready for production and code that is still in development. It also makes it easy to roll back changes if something goes wrong. However, Git flow…
Contents
-
-
-
-
-
-
(Locked)
Understanding Git branches1m 45s
-
(Locked)
Creating a Git branch3m 2s
-
(Locked)
Using pull requests2m 4s
-
(Locked)
Merging a pull request in Git2m 26s
-
(Locked)
Understanding Git merge methods2m 36s
-
(Locked)
Performing a merge and rebase4m 51s
-
(Locked)
Handling merge conflicts3m 30s
-
(Locked)
Git branching strategies2m 16s
-
(Locked)
Using the Git flow branching strategy4m 41s
-
(Locked)
-
-