背景:
作为分布式版本控制系统的代表git和github已经成为大多数开发人员首选版本控制工具。由于其不同与SVN的集中式版本管理,因此在协同工作时的方式略有不同,下面让我们来对比分析一下(这里以本人的DICOM3.0标准中文版开源书籍为例):
合并他人的Github仓库(Merge Other’s Repo on Github):
1. 查看当前状态
F:\GitTest\zssuretest\DICOM-Chinese>git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean
F:\GitTest\zssuretest\DICOM-Chinese>git remote -v
origin https://github.com/zssure-test/DICOM-Chinese.git (fetch)
origin https://github.com/zssure-test/DICOM-Chinese.git (push)
other git@github-test:zssure-test/DICOM-Chinese (fetch)
other git@github-test:zssure-test/DICOM-Chinese (push)
zssure-thu-origin https://github.com/zssure-thu/DICOM-Chinese.git (fetch)
zssure-thu-origin https://github.com/zssure-thu/DICOM-Chinese.git (push)
F:\GitTest\zssuretest\DICOM-Chinese>git pull
Already up-to-date.
2. 添加他人仓库
F:\GitTest\zssuretest\DICOM-Chinese>git remote -v
origin https://github.com/zssure-test/DICOM-Chinese.git (fetch)
origin https://github.com/zssure-test/DICOM-Chinese.git (push)
other git@github-test:zssure-test/DICOM-Chinese (fetch)
other git@github-test:zssure-test/DICOM-Chinese (push)
zssur