Once here, it's important to emphasize the normal workflow: git pull edit stuff with an occasional git add , git rm , or got mv commit and an occasional git push Regardless of how much you emphasize the workflow you're now going to have to cover merges as well how to recover from problems by going to an earlier revision.