#Created my_first_repo Added text Added text through web browser Added text locally Added text to a new branch Resolving conflict