Time is progressing, now is not the time of SVN, many people are using Git. So I also learned a little bit about the use of git.
Common steps to commit code via GIT:
Git Status: View file Status: This command displays all files that you have modified in your project.
git add–a: Add upload file: The command user adds the file you want to submit (-a) is the commit all. If you submit it separately, you only need to add a separate file path (the path can be a file or a folder).
Git commit-m "Append delete file": Submit File command, which tells git add file conditions to the local git server.
Git push origin head:refs/for/develop: Push to remote naming, which tells The local server that the modified file was pushed to the remote server.
Common ways to resolve conflicts:
Git stash: The content that was originally modified is saved, and the command saves information about the changes in the project.
Git pull: Get new content from the server
Git stash pops: Merging buffers and updated content.
Simple and useful commands about Git