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
Here is another solution to resolve this issue
>git pull >git commit -m "any meaning full message" >git push