43. Merging pulled changes

Goals

  • To learn to get the fetched changes into the current branch and working directory.

01Merge the pulled changes into the local master branch

Run:

git merge origin/master

Result:

$ git merge origin/master
Updating 6e6c76a..2faa4ea
Fast-forward
 README |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

02Check the README again

Now we should see the changes.

Run:

cat README

Result:

$ cat README
This is the Hello World example from the git tutorial.
(changed in original)

These are the changes. Although “git fetch” does not merge the changes, we can manually merge them from the remote repo.

03Next

Now let’s have a look at combining fetch & merge into a single command.

SVN?
© 2011-2014 Git How To. All rights reserved / Contact us