Step 1: Creating a repository, adding some files, and committing them

Take a look at the following slides and see how merging takes place: