Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.Sign up
episode 9 - conflicts: update output to reflect most recent version of git #627
The most recent version of git and github have slightly different responses than the text originally in the lesson. The below output is the most current version of the output. In the below output, the commit IDs have been updated to reflect IDs originally used in the lesson, for continuity.
"add a line in our home copy"
"Line in my copy" error message for
"merge changes from github"
back again to collaborator who made the first change