Always do "git pull -r", and pull "master" branch.