Merge will take two commits and attempt to produce a commit that includes the changes that were made in both branches.
The kinds of git-specific files we know about
The kinds of checks to perform according to which filesystem we are trying to protect
Check whether a path component corresponds to a file.