Cause: Because your local code is not the latest version at the time of submission, Git does not know which version is the standard. To prevent code overwriting, Git does not allow your submission
Solution:
As you can see from the error message, the first step is to let you git pull
Vim editor opens conflicting files (here I am used to vim)
Save what you want to keep and exit
Then submit the step again
Git add. Git commit -m “conflict resolution” git push
