Move get_head_sha into testing since it is only used by tests.
Implement merge-files only using @bukzor's method.
Add logging message.
Merge pull request #84 from pre-commit/merge_conflict_files_only_31

Merge conflict files only 31