The use of Git in iOS development

Just joined the company just in time to catch the SVN transition to git as a rookie can only accept the guidance of the boss, in this record my study journey.

First the company's it deployed a git server, our project team added the branch of iOS, our daily code is submitted in this branch,

Go to the relevant branch of the homepage after selecting HTTP on the right, copy the relevant address,

Enter the Git clone-related address from the Mac's terminal, clone the server-side code locally, and use git checkout branch name to export

You can find and open the relevant project in the local storage path, and each upload requires a CD path name to enter the folder

Use git add when you are finished working every day. Then use git commit-m "custom name" to upload to the local, and then use git pull to update the remote server code to the local again, and finally use git push to save the local code

Upload to the server, and finally use Git status to check the local version.

This is the most elementary command, the process of uploading will also encounter because of the conflict caused by the failure to upload, and can not automatically merge conflicts, then you need to manually modify the conflict, to determine whether to keep the server-side or local modifications,

Not to be continued!