From the course: Visual Studio: Source Control with Git and GitHub

Unlock the full course today

Join today to access over 22,400 courses taught by industry experts or purchase this course individually.

Merge changes into the master

Merge changes into the master - Visual Studio Tutorial

From the course: Visual Studio: Source Control with Git and GitHub

Start my 1-month free trial

Merge changes into the master

- It's time look at how to merge two branches together. Now, in traditional programming, you might wait days or weeks or even months to emerge back into master or the trunk, as they used to call it. But as we've seen, it's so easy to create branches, and they're such a light weight feature of Git, that it's more common in Git code basis to go ahead and create your small branch, do a little bit of work in there, and then merge back. So, lets see how that would work. Let's review what we have. I'm in B3, and I've get this external line in the colors text file, and if I check out Master and see that it's missing that line. So, I want to merge from B3 into Master. I'll do that my right clicking here, and choose Merge from, and let's see what we have. Merge from a branch, I'll pick the branch I want to merge from into branch master. And then down here, I've got a choice of just merging directly, or I can merge and attempt…

Contents