rejected master -> master (non-fast-forward)

Question

I\'m trying to push my project (all files in a new repository). I follow the steps but when I push with git push -u origin master I get this error:

Answer 1

This is because you have made conflicting changes to its master. And your repository server is not able to tell you that with these words, so it gives this error because it is not a matter of him deal with these conflicts for you, so he asks you to do it by itself. As ?

1- git pull This will merge your code from your repository to your code of your site master. So conflicts are shown.

2- treat these manualemente conflicts.

3-

git push origin master

And presto, your problem has been resolved.