lab 43 Merging Pulled Changes
Goals
- Learn to get the pulled changes into the current branch and working directory.
Merge the fetched changes into local master 01
Execute:
git merge origin/master
Output:
$ git merge origin/master Updating 2fae0b2..2e4c559 Fast-forward README | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
Check the README again 02
We should see the changes now.
Execute:
cat README
Output:
$ 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.
Up Next 03
Next let’s take a look at combining the fetch & merge process into a single command.