Created my_first_repo Added text Added text in web browser Added text local Added text in a new branch 'newbranch' Resolving text 'conflict in the browser'