Update Ch5-MergeConflicts.pptx - Slides 10-12 and 19 - Conflicting Changes #100
Description
Update slides 10-12 in the Ch5-MergeConflicts.pptx slide deck.
Care should be taken to ensure that the commit letters in the Git commit diagram match those in the boxes at the bottom that show the text being merged.