Changes to master branch in git

Lets 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.

Step1:Update the README file with the changes.

FILE: README

This is the Hello World example from the git tutorial.

Step2:Commit changes of README file in the master branch.

RUN:

git checkout master
git add README
git commit -m "Added README"