Actions

EmSys

Git - Changes in Master

From EdWiki

GitLab - Changes in Master

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

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

  • Switch to the master branch.
git checkout master
  • Create the README.
  • File: README
This is the Hello World example from the git tutorial.
  • Commit the README to master.
git add README
git commit -m "Added README"