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.
Using the Git flow branching strategy
From the course: Designing and Implementing Source Control using GitHub and Azure DevOps
Using the Git flow branching strategy
- [Instructor] Now let's dive into the Git Flow branching strategy. This strategy defines a set of branches and their purpose to facilitate parallel development of new features, hot fixes, and releases. Recall that the Git Flow branching model consists of two main branches, master and develop. The master branch is the main branch and should always contain stable production ready code. The develop branch is used to develop and integrate new features. We can complete this demo using Azure DevOps. Let us open the report that we imported from GitHub in a previous lesson. Now let us create the develop branch. After the develop branch has been created, let us create a feature branch based on the develop branch. In naming a feature branch, the feature branch should represent the name of the feature being developed. The naming pattern usually includes a stating feature, slash, and the name of the feature that is going to be…
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)
-
-