github - git submission error

Question

1. The files were cloned from github to local
2. Some files were modified
3. git submitted, the error was reported as shown in the figure
Some people online said it was a submission conflict, but I just modified it locally

git pull --rebase
git push origin master
Another error is reported. It’s really confusing not to understand the principle

Answer 1

Thank you for the invitation. If a conflict occurs when executing git pull origin master, execute git push origin master after resolving the conflict. If there is no conflict, just execute git push origin master directly. Hope it helps you

Answer 2

It seems that someone else has also submitted the code. Because the base point is different, your submission request has been rejected.

You can try to execute it firstgit pull --rebase，如果有冲突，解决冲突；再git pushTry it once

Answer 3

In this case, the code in the git repository is usually updated, and your local code is not the latest and cannot be pushed. Just execute the git pul command