GitTutorial roses are red, violets are blue, git commit -m , "here's a merge conflict for you :)" Follow the entire tutorial here: tinyurl.com/MIT-AT-GIT-DOC