GitHub for Windows melon-level operation 1

For instructions on how to install, register, and create a warehouse, please refer to http://www.cnblogs.com/foreveryt/p/4077380.html

1, click on the upper right corner + number to create a new local warehouse lhj. Click Create Repository.

2, the desktop LHJ warehouse will automatically generate some git configuration files. Don't care about them.

3. We add a text file within the warehouse.

4, switch to the GitHub desktop version, will automatically detect changes in the warehouse, and in uncommitted changes clearly listed.

5. Add summary (abstract) and description (description) To this update and click Commit to Master. Submit this change to your local Git.

6. Now we synchronize this version of the warehouse to the GitHub website, click Publish Repository.

7. Right-click Viem on GitHub and we see that our warehouse has been synced to the server on GitHub website.

8. Repeat the above steps to build several different versions and sync to the GitHub website.

9, How to update the local warehouse to version 1.0? The current version is as shown in. Select the version you want to return to, and copy the version of Sha Key. Select the local warehouse and open the shell Command window. Enter git reset--hard SHA

10, we check the local warehouse LHJ, the following is indeed restored to version 1.0

11, if now a classmate called YT from GitHub download version 1 of the warehouse, we create a new Yt-branch development Branch simulation. We modified the code on the basis of version 1. For example , change version 1.0.txt content to Yt-message. Then sync to the GitHub server.

12. Viewing changes on the GitHub server has become 2 branches.

13, now the project is the initiator of the equivalent of our master found yt-branch this user to version 1 of the modification is very good, want to change the contents of the YT modified to master the latest version 3.0. This will use the merge (merge) operation . Click Merge below. Drag the branch and version 3.0 that you want to merge into the black box below, then click Merge to OK.

14, the following master in the local warehouse version 1.0.txt content has changed.

15, now if YT and LHJ users have downloaded 3.0 version of the project YT to version 3.0.txt content changed to YT-MESSAGE3,LHJ version 3.0.txt content changed to Lhj-message3. When YT first updates it to GITHUB,LHJ, a conflict occurs when the update is updated . How to solve? Lhj To manually modify conflicting files when committing to GitHub. And then submit it again (here do not know how to simulate, multi-person development is according to this idea is no problem).

Let's do it again. It is said that the recommended friends for 15 years can raise the salary! Thank you ~

GitHub for Windows melon-level operation 1