From the course: Source Code Control in .NET with Git Using SourceTree
Join today to access over 22,500 courses taught by industry experts or purchase this course individually.
Show different views, and merge
From the course: Source Code Control in .NET with Git Using SourceTree
Show different views, and merge
- [Instructor] So where are we in our two development environments? User one has a calculator, that calculator has add and subtract, let's take a look at that. And our runner is calling those methods. User two, however, doesn't have any of that. The runner has no calculator to call, and there's no calculator class. And that is, as you'll remember, because we did all of the work in user one on this branch. It's time to merge that branch back into master. To do that, we change to the master branch. Because you always merge into a branch. Now that we're on master, we can merge our branch from calculator, and so we click merge, and it asks us where we want to merge from. And we're going to click on Merge Fetched and choose originCalculator. We're now going to click OK and SourceTree is going to merge Calculator into the master branch. And notice that it says that we're two ahead and it shows that our local repository master has been merged with Calculator and that our repo is two behind…
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.
Download courses and learn on the go
Watch courses on your mobile device without an internet connection. Download courses using your iOS or Android LinkedIn Learning app.