Changes in Master

Goals

• Learning how to deal with multiple branches with different (and possibly conflicting) changes.

While you were changing the greet branch, someone else decided to update the master branch. They added a README.

Switch to the master branch.

Execute:

git checkout master

Create the README.

README

This is the Hello World example from the git tutorial.

Commit the README to master.

Execute:

git add README
git commit -m "Added README"