github-workshop-tutorial A demo repository for learning basic Git master - simple fix, add, commit merging - simple merge to master conflict_1 and conflict_2 - Fix error in conflict_1, and attempt to merge conflict_2 onto conflict_1