Managing Merge Conflicts
This arises out of the discussions in #26 . Please read @daniel.mcdonald 's original comments there. We'll maybe come back to this in class, as it gets to the heart of what git can do that Word's "Track Change" function can't; but it also speaks to the issue of "ultimate authority" which we broached in class on 18.03.20. Feel free to add to this if you have any questions or experiences.