Merge conflict? I don't know her.
These are the steps to just get you to the most recent commit
- git checkout master
- Make sure you're on the master branch. Please.
- git fetch -all
- This will get ALL the latest files onto your system.
- git reset --hard origin/master
- git pull origin master
- This is it. This is the one.