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.
Merging feature branches
- [Instructor] In this lesson, we'll walk through how we maintain our merge as a feature branch provided by a contributor. The merge is performed after code review has been completed and all suggestions have been applied. At this point, the contributor's work is complete so we will be logged in to the GitLab UI as a maintainer. The first thing the maintainer will notice is that the merge request has been added to GitLab, so let's enter the merge request section and we'll drill down into the Missing Feature A merge request. The maintainer has already performed a code review, so they are safe to perform the merge. This will merge the code changes in the Missing Feature A branch into develop. So let's go ahead and click on the Merge button and once the merge is complete, we can scroll down to the bottom and close the merge request. At this point, the changes are now in the Develop branch and we'd like to build a Release Candidate branch that can be merged into Master. To do that, we're…
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
-
-
-
-