Git Action Learning Resource URL

Git for a while, a little bit of their own experience. Personally feel that he is more flexible and more reasonable than SVN.

A number of learning resources have been collected on a succession of continents:

1. Understanding git version control in Xcode

http://www.open-open.com/lib/view/open1399179356984.html

2. Add Project to GitHub

http://www.daxueit.com/article/3414.html

3 OPS personnel should be staffed by a GitHub

http://www.bubuko.com/infodetail-179690.html

4.github company Account Application Address

Https://enterprise.github.com/home

5. GitHub's basic features:

http://www.zhihu.com/question/20070065

6.pull Request Workflow

http://blog.jobbole.com/76854/

7 using OSC git in Xcode

http://www.noisyguy.com/archives/1083.html

8 . Conflict resolution under Git

(1) http://www.cnblogs.com/sinojelly/archive/2011/08/07/2130172.html

(2) http://www.liaoxuefeng.com/wiki/0013739516305929606dd18361248578c67b8067c8c017b000/ 001375840202368c74be33fbd884e71b570f2cc3c0d1dcf000

9 ways to ignore userinterfacestate.xcuserstate in Git

Http://www.tuicool.com/articles/JjIZFnI

Add: When you have pod management, you should do it again with the userinterface path in the pod.

Here are some specific action scenarios:

1. Delete a branch

Delete a remote branch (two types are available )

Git push Origin--delete Branch_name

git push origin:branch_name  

Delete local Branch

Git branch-d branch_name

2. New Branch

New local Branch

Git branch Branch_name

Pushing a local branch to a remote branch is equivalent to creating a new remote branch (the name of the new remote branch after the semicolon, preferably the name of the local branch)

Git push Origin Branch_name:branch_name

Create a new branch and go to that branch

Git checkout-b branch_name

3. Delete tag

Delete local tag

Git tag-d v1.01

Delete remote tag (two types)

Git push origin--delete tag v1.01

git push origin:refs/tags/v1.01

4. Create a new tag

New local Tag

git tag v1.01

New remote tag (equivalent to local tag push to remote, so local must be by tag)

Git push Origin v1.01:v1.01

5. deleting files

When the local file is deleted should git commit-a-m ' Delete the file ' and then push to the remote branch, the remote branch of the file can also be deleted synchronously

Delete local Files

git rm new.txt

6. Merging branches

Current Branch and Branch_name branch (local)

git merge Branch_name

Merging local and remote branches

git merge Origin/branch_name

7. Team work to get someone else's code

git clone address

8. Create your own project Local Code Association remote Library

No, just git remote RM origin

(1). CD to current directory

(2). Git init//Initialize the local git repository (if it is already deleted by the local repository. Git then executes this code)

(3).. git remote Add origin address//associate a long-range git repository

(4). Git pull-u origin master//Synchronize files from the remote Git repository to local (Readme and ignore)

(5). Git Add. Keep all the files under control

(6). Git commit-a-M ' init '//submit all files locally

(7). Git push origin master//submit to Remote Library

9.bug Branch

Background: Master Branch

Dev Branch (branches separated from master)

When you code-edit the dev branch, someone suddenly asks you to modify the bug in master??

You can separate a bugbranch branch from master, then modify the bug, Commit, and then merge with Master. (Do not be careful when merging with Dev will conflict, because the dev branch and the master and the time, will only separate the original master has a different enemy to merge into master, so the fixed bug is not overwritten.) Of course, if the bug and dev both modify a file at the same time, the merger when the interpretation is good!!! ）

10. Upload a single file over 100M

git config--global http.postbuffer 524288000

11. Revocation of the merger

$ git checkout "The branch where the row merge operation is located"

$ git reset--hard "merge before" version number

Git Action Learning Resource URL