From the course: Git for Teams
Unlock the full course today
Join today to access over 22,400 courses taught by industry experts or purchase this course individually.
Git Flow wrap-up
- [Instructor] There's one final thing we'll need to do as the maintainer to complete the GitFlow Workflow. The maintainer needs to update the develop branch with the latest changes. Remember that we made a minor QA fix to the release candidate branch that was only merged into the master branch. That change needs to be pulled into the development branch so that future feature branches that are branched off of develop include the fix. Let's build out that merge request so that we can get develop up to date. So click on Merge Requests on the side bar and then I'm going to click on the New Merge Request button. I'm going to select master as my Source branch, and then I'm going to select develop as the Target branch. I'll then compare the branches and the Merge Request form will provide me with a title for the merge request. We can see that the Source branch is master, the Target branch is develop. It's exactly what we want to do. We see the Commits that will go into develop. So let's go…
Practice while you learn with exercise files
Download the files the instructor uses to teach the course. Follow along and learn by watching, listening and practicing.
Contents
-
-
-
-
Teaming with remote platforms overview1m 39s
-
Remote platform selection4m 19s
-
GitLab installation4m 16s
-
GitLab overview4m 36s
-
User account setup4m 44s
-
Account administration and preferences3m 17s
-
Keeping secrets3m 30s
-
Git workflows1m 11s
-
Trunk-based development3m 13s
-
Git flow3m 35s
-
Protecting branches4m 42s
-
Issues6m 59s
-
Feature branches6m 4s
-
Code reviews4m 4s
-
Merging feature branches4m 18s
-
Git Flow wrap-up1m 51s
-
-
-
-