Stop git pull from auto-merging