I am fairly new to git yet currently using it to manage our code in a team environment. I had some rebasing issues and I fixed them using
git
git ch
I had a similar problem and I resolved it with: git pull origin
git pull origin