mcgraths
1/15/2015 - 11:50 AM

Force Git to overwrite local files on pull (keeping untracked files intact)

Force Git to overwrite local files on pull (keeping untracked files intact)

git fetch --all
git reset --hard origin/master