GitHub's approach to submitting code to the server

In the first case, there is no conflict:
1.git Add.//Go to the center of the project to package the local file meaning
2.git Pull Origin dev//Download the server's code locally if it is up-to-date and will prompt already up-to-date
3.git commit-m "Search Complete"
4.git push origin dev//means push the code to the server if you can't ctr+c and then push it.
In the second case, there is a conflict:
1.git Add.//Go to the center of the project to package the local file meaning
2.git Pull Origin dev//Download the server's code locally if it is up-to-date and will prompt already up-to-date
If there is a conflict, it will prompt the conflict.
3. Git stash//has conflicts stash the conflicting files are stored, stash: Storage
4. Git pull origin dev//can download the code from the server because the local conflict file is already packaged
5.git stash pop//to remove stash files
6. Git Add.//Package The local file again
7.git commit-m "Search complement Add entry limit"//Add an identity to the file submission that has already been packaged
8. Git push origin dev//to submit the packaged files to the server

GitHub's approach to submitting code to the server