saltstack/salt — pull request #7927 by tones111 (2013-10-17 20:43:03+00:00)
Title: 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.

This resolves Issue #6992