git_pillar: Don't merge updates

When updating the local cached repository don't try to pull/merge the
changes as the operation will fail if merge conflicts exist.  We only
want to mirror what's in the remote repository.
Merge pull request #7927 from tones111/pillar

git_pillar: Don't merge updates