如何把github上别人分支合并到自己（分支）项目中

注：以下代码在git-bash中运行。我的项目在D:\daima\Android
 
我现在的分支是signup_login, 我想把studio分支合并到我的项目里
（ cd是进入,ls是查看 ） 
qiwei@android▒▒▒▒ΰ MINGW64/
$ cd d:

qiwei@android▒▒▒▒ΰ MINGW64 /d
$ ls
$RECYCLE.BIN/       eula.1042.txt          Program Files/
1.5 正式版/         eula.2052.txt          Program Files (x86)/
360downloads/       eula.3082.txt          System Volume Information/
Androidstudio/      install.exe*           VC_RED.cab
android学习用/      install.ini            VC_RED.MSI
android学习用.rar   install.res.1028.dll*  vcredist.bmp
BaiduYunDownload/   install.res.1031.dll*  安装包/
Cache/              install.res.1033.dll*  安卓杂乱的/
daima/              install.res.1036.dll*  安卓杂乱的.rar
eula.1028.txt       install.res.1040.dll*  代码群/
eula.1031.txt       install.res.1041.dll*  代码群.rar
eula.1033.txt       install.res.1042.dll*  图片资源/
eula.1036.txt       install.res.2052.dll*  项目代码/
eula.1040.txt       install.res.3082.dll*
eula.1041.txt       KuGou/

qiwei@android▒▒▒▒ΰ MINGW64 /d
$ cd daima/

qiwei@android▒▒▒▒ΰ MINGW64 /d/daima
$ ls
Android/  Android-studio0114下午.rar  Ehuizhan/  E会帮代码.rar

qiwei@android▒▒▒▒ΰ MINGW64 /d/daima
$ cd Android/

qiwei@android▒▒▒▒ΰ MINGW64 /d/daima/Android (signup_login)
$ git branch -r
  origin/HEAD -> origin/master
  origin/adapt
  origin/add-card-item
  origin/depth-chart
  origin/horizon-tabed
  origin/kcharts
  origin/master
  origin/new-design
  origin/null-pusher
  origin/signup_login
  origin/studio
  origin/unsub-channel

qiwei@android▒▒▒▒ΰ MINGW64 /d/daima/Android (signup_login)
$ git merge studio
Auto-merging src/com/klsd/utils/MyHTTP.java
CONFLICT (content): Merge conflict in src/com/klsd/utils/MyHTTP.java
Auto-merging src/com/klsd/utils/JSONHandler.java
Auto-merging src/com/klsd/main/BaseActivity.java
Automatic merge failed; fix conflicts and then commit the result.

qiwei@android▒▒▒▒ΰ MINGW64 /d/daima/Android (signup_login|MERGING)
$