add some more update and status calls to the test-merge script to bounce it around a little and also check that the final state looks sane
typo fix
make shell script executable
begin documentation on merge conflicts and resolutions
more stories into how a merge conflict can happen.
flow and punctuation
let's consistently talk about version names first, then hashes second
split run on sentence
finish explaining why that's bad
Merge branch 'doc'

the new document for resolving merge conflicts is perhaps a little redundant, but it'll do.  and this is probably a reasonably place for thorough and calm reiteration of literal steps if there ever was one.