lab 43 Merging Pulled Changes
- Learn to get the pulled changes into the current branch and working directory.
Merge the fetched changes into local master
git merge origin/master
$ git merge origin/master Updating ff7c118..2eece92 Fast-forward README | 1 + 1 file changed, 1 insertion(+)
Check the README again
We should see the changes now.
$ cat README This is the Hello World example from the git tutorial. (changed in original)
There are the changes. Even though “git fetch” does not merge the changes, we can still manually merge the changes from the remote repository.
Next let’s take a look at combining the fetch & merge process into a single command.