git is a distributed version control system
Git is a free software distributed under the GPL
git has a mutable index called stage
git tracks changes
creating a new branch
<<<<<<< HEAD
creating a new branch is quick &simple
=======
creating a new branch is fast and easy
add merge
<<<<<<< Updated upstream
=======

modify the file
>>>>>>> Stashed changes