Pull rebase causing file changes and many other commits

[sharif (Sharif Magembe)]

Can you do a git reset --hard origin/master though this might cause you to lose your current local changes.