git out of sync

The git repo was out of sync yesterday and has since been repaired. You might get merge conflicts when pulling down. If so you can either delete and re-clone your repo or use this:

git pull -X theirs origin master



  • Another option is to do pull + rebase: git pull --rebase.
    If you did a regular pull + merge, you can then simply reset the master branch to origin/master.

Sign In or Register to comment.