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:

  1. git checkout master

Create the README.

README

  1. This is the Hello World example from the git tutorial.

Commit the README to master.

Execute:

  1. git add README
  2. git commit -m "Added README"