26. Changes to master branch
- 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.
This is the Hello World example from the git tutorial.
02 Commit changes of README file in the master branch.
git checkout master git add README git commit -m "Added README"