Have you tried to pull the remote repository first and fix the merge conflicts - if exists- first? After you do it try to push ur changes again & u can also try it with git push -f to force push to the branch