Scenario:
The solution is very simple and worked for me.
Try this :
git pull --rebase
then
git push -u origin master