git ... I can tell the truth now glimpses of his ability to control the powerful but still is not used to operating in .... no matter what problems I will be here ,,,,
Upload a local project to the existing code cloud
· First need to create a cloud now code warehouse
· git then use the tool to the project the following at the command line
-by git init initialize git project is a project
-by . Git add all the files into the staging area (if found missing .gitignore file, then look to see if the file is ignored thinkphp thinkphp project is the default folder)
· git the commit -m "description" submitted to the local repository
· git the Add remote Origin remote address linked to a remote address
· even the new general remote warehouse will have readme.md or initialization file so usually first with git pull things got me down
-and upload git push -u origin master meant to submit code to the master branch alias for the origin of the remote repository (I did not say wrong, right)
· in general there should be no mistake ,,, but I actually always wrong ... the problem is that the merger failure (a conflict)
`because it is the first time the relationship is not something so remote repository directly via git push -u origin master --force force covering the remote code (super not look for recommendations to resolve the conflict manually position)
Additional
Conflict resolution, the blogger said very clearly that I do not carry a cheeky
https://blog.csdn.net/qq_34886018/article/details/86479467