java代码库 如何合并Git代码库中牛人的代码到自己的库

如何合并Git代码库中牛人的代码到自己的库  

C:UsersgeffzhangDocumentsGitHubSharpOAuth2 [master]> git branch –a # 查看所有分支

* master

remotes/origin/HEAD -> origin/master

remotes/origin/master

C:UsersgeffzhangDocumentsGitHubSharpOAuth2 [master]> git remote add coretea

m git://github/ghorsey/SharpOAuth2.git #加入主项目地址,以便跟上更新

C:UsersgeffzhangDocumentsGitHubSharpOAuth2 [master]> git fetch coreteam

remote: Counting objects: 297, done. #获取主项目更新

remote: pressing objects: 100% (108/108), done.

remote: Total 227 (delta 147), reused 165 (delta 85)Receiving objects: 73% (166

Receiving objects: 74% (168/227), 60.00 KiB | 10 KiB/s

Receiving objects: 100% (227/227), 74.24 KiB | 10 KiB/s, done.

Resolving deltas: 100% (147/147), pleted with 48 local objects.

From git://github/ghorsey/SharpOAuth2

* [new branch] master -> coreteam/master