GitHub Code Hosting Tools

GitHub Desktop installation graphical management tool for the first time using the Code hosting management tool GITHUB1, first log in to register, build your own project, or team Project 2. View your project Your Profile3, go to the project group FORK4. Ignore the file. Gitignore The file is ignored by the local newly added file, as far as the modification will be detected, regardless of whether the ignored file is in this face 5. Install the graphical management tool Sourcetree+git-2.7.2-64-bit.exe installation package (after Sourcetree is installed, If you haven't installed Git, you'll need to download msysgit to install it. Because Sourcetree is actually just a shell, it needs to invoke the GIT command line to function.

git installation, fool-mounted, direct next;

Git tools: In the client can use Sourcetree for code submission, branch new and so on, in time you do not understand the git command https://git-for-windows.github.io/download install git command line 6. After installing the client click clone/ Create a new replication path, then clone for conflict processing

When two branches make different changes to the same text block of the same file and try to merge, Git cannot merge automatically, called Conflict (conflict). Resolving conflicts requires manual processing.

For example, in the master branch, want to merge the dev branch, resulting in a conflict, open the file content can see a conflict:

<<<<<<< headtest in master=======test in Dev>>>>>>> Dev

　　The <<<<<<< tag conflict begins with the contents of the current branch.

　　The HEAD points to the commit of the current branch's distal.

　　After the ======= ,>>>>>>> was the code on the other branch to merge over.

　　Dev after >>>>>>> is the name of the branch.

　　 for a simple merge, edit it manually, then remove the tags, and finally add the commit as usual.       go online dev base is dev when you submit it, take the issues number #47 this issues, there's a space in the middle.

GitHub Code Hosting Tools