From the course: Git for System Administration
Join today to access over 22,600 courses taught by industry experts or purchase this course individually.
Merging branches - Git Tutorial
From the course: Git for System Administration
Merging branches
- [Teacher] After you've made changes to files, let's assume that the changes went well in testing, and you want to merge them into master, for this we'll need to merge the branch, let's take a look at our branches first, type in git space branch and hit enter. We can see that we have two branches and we can see that we are currently in our development branch. We have two types of merges, the first type of merge is a fast forward merge, in this case, the master branches stay the same, and the only changes are in the development branch we made. Let's take a look at the changes again. Type in git space diff space master dot dot development, and hit enter. We can see that we have one change in development, that doesn't exist in master, this means we can do a fast forward merge. To do a fast forward merge, we just need to use git merge, let's go back to the master branch, to do so type in git space checkout space master, and then hit enter, and now let's merge development, type in git…
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.