Added details for merging in an existing repo.

I used the sample-project branch to test the details. I created it from
scratch, then rebased it on top of the initial-commit branch and pushed
it.