Had same problem caused by someone on repo using force when pushing to branch, if no changes have been made use git fetch origin and git reset --hard origin/.