Change git update process from 'pull' to 'fetch' & 'reset'

This change avoid conflicts pulling commits from origin.