git pull tutorial

14. Conflict resolution14.1. SceneConflicts occur when both branch A and branch B have modifications on the same file. The common scenario is that the new branch Dev is generated from the master branch and then modified and addcommit on the dev. The same file was later modified on master, and the add commit, the operation of merging two branches will fail.$ git merge feature1auto- in then commit the result.14.2. Conflict resolutionHere

First step: Install GitStep two: After the installation is complete, start playing git, initializeGit init file initializes the current directory as a Git repository and generates a. Git repository fileGit add file joins Git's staging area with a commit command to commit to the repositoryadd to Repository staging area Stage,commit to master Main branch, head is a

1. Generate Secret Key (direct enter, key storage path See command line information)2. To open the key, it is important to note that the . SSH may be hidden, which requires ctrl+h to show hidden folders3. Copy the secret key, add it to GitHub (Settings),4. Add User Information5. Clone a file test (there is a small problem at the time of submission, follow the prompts to set the line)6. Submit (Linux each time to enter the user name password, do not know whether it is security or set the wrong, W

Easy command-line introductory tutorial:Git Global Settings:git config--global user.name "imsoft" git config--global user.email "[Email protected]"To create a git repository:mkdir IMSOFT.GITHUB.IOCD imsoft.github.iogit inittouch readme.mdgit add readme.mdgit commit-m "First commit"git Remo Te Add Origin Https://git.oschina.net/imsoft/imsoft.github.io.gitgit push-

Reference URL:Http://www.admin10000.com/document/5374.htmlHttp://blog.sina.com.cn/s/blog_4f3b79d0010166ab.htmlCurrently in version control is the mainstream use of Git, the more popular have GitHub and BitBucket, they each have what characteristics, the developer how to choose: Github: Currently the largest code hosting site, most of the world's Open source software is hosted here, has developed into a software development collaboration communit