1.切到远程分支查看一下git checkout origin/branchname
2.将远程代码下载到本地:git fetch origin branchname
3.合到本地:git merge origin/branchname
4.提交到本地:git commit -m "merge"
1.切到远程分支查看一下git checkout origin/branchname
2.将远程代码下载到本地:git fetch origin branchname
3.合到本地:git merge origin/branchname
4.提交到本地:git commit -m "merge"