GitExercise_Conflicts

1. Clone this repo to your datahub or local computer (your choice)
2. Merging ex1 branch into main branch... the difference here is a simple line of text conflict
   1. first look at the diff
   2. now merge ex1 into main; note how the conflict gets shown to you

GitExercise_Conflicts

1. Clone this repo to your datahub or local computer (your choice)
2. Merging ex1 branch into main branch... the difference here is a simple line of text conflict
   1. first look at the diff
   2. now merge ex1 into main; note how the conflict gets shown to you
   3. resolve the conflict in whichever way you choose; the middle column is the final result