From the course: Complete Guide to Git

Unlock the full course today

Join today to access over 24,900 courses taught by industry experts.

Merge in fetched changes

Merge in fetched changes - Git Tutorial

From the course: Complete Guide to Git

Start my 1-month free trial Buy for my team

Merge in fetched changes

“

- [Instructor] In this movie, we will learn how to merge in changes that have been fetched from a remote. In the last movie, our simulated collaborator, Linda, fetched the latest branches and commits from the remote repository, but the fetch command did not merge the new commits into her local main branch. From inside the repository I've called Linda Version, we're going to use GI log dash five dash dash one line. We'll use Origin Main to see what's on that remote tracking branch. That represents the main branch on the remote server the last time that I checked in with it. You can see that the remote tracking branch is referencing the last commit while the main branch is still referencing the prior commit, we could inspect this new commit and see what changed. We can use get log, show, diff. Remote tracking branches are like other branches except that they're read only. We can merge them into other branches, but we can't merge other branches into them. We use push when we want to…

Contents