Update Ch5-MergeConflicts.pptx - Slides 5-9 - Merging Changes #99
Description
Update slides 5-9 in the Ch5-MergeConflicts.pptx slide deck.
The GitHub portion of these slides is identical on all slides. It is also a portion of the diagram that appears on slide 4. Thus, the significant work here will be in revising the Git commit diagrams to use lettered circles for commits.
Care should be taken to ensure that the commit letters in the GitHub diagram match those in the Git commit diagram and in the boxes at the bottom that show the text being merged.