On Wed, Jun 24, 2020 at 6:20 AM John Cowan <xxxxxx@ccil.org> wrote:
Well, the dedication is gone.  I even went to the trouble of removing the commit that added it (git rebase -i is your friend if you ever need to do this).  But then I merged with Harold's repo and it came right back, because DVCSes can't tell the difference between deleted content and nonexistent content, and can't even give you a merge warning about it.  So I flushed the actual text out again, but removing it from the history again probably won't work.  In any case, the PR is now mergeable.

Thank you for trying, and for removing it from the document in the end.  I hope one of us gets to share this incident with Olin — the right Olin — in person some day.  He'll appreciate it.

Unfortunately, Github still lists merge conflicts.  It looks to me like the second merge choice is the correct one for each hunk, but I'm not confident.  Please resolve the conflicts or advise me.
I wonder who the other Olin Shivers was, and whether he's related?  WP lists a handful of Shiverses; I've only heard of the author Louise Shivers.

Olin hails from Georgia, as does she.  I wonder whether they're related.