26. Changes to master branch

Goals

  • To learn how to work with several branches with different (sometimes conflicting) changes.

At the time you are changing the style branch, someone decided to change the master branch. He added a README file.

01 Update the README file with the changes.

File: README

This is the Hello World example from the git tutorial.

02 Commit changes of README file in the master branch.

Run:

git checkout master
git add README
git commit -m "Added README"
SVN?
© 2011-2014 Git How To. All rights reserved / Contact us