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

Merging feature branches - Git Tutorial

From the course: Git for Teams

Start my 1-month free trial

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…

Contents