DICOM:DICOM3.0标准中文版开源书籍编辑之”github仓库合并“

背景:

作为分布式版本控制系统的代表git和github已经成为大多数开发人员首选版本控制工具。由于其不同与SVN的集中式版本管理,因此在协同工作时的方式略有不同,,下面让我们来对比分析一下(这里以本人的DICOM3.0标准中文版开源书籍为例):

合并他人的Github仓库(Merge Other’s Repo on Github):1. 查看当前状态F:\GitTest\zssuretest\DICOM-Chinese>git statusOn branch masterYour branch is upnothing to commit, working directory cleanF:\GitTest\zssuretest\DICOM-Chinese>git remote -vorigin 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-originhttps://github.com/zssure-thu/DICOM-Chinese.git (fetch)zssure-thu-originhttps://github.com/zssure-thu/DICOM-Chinese.git (push)F:\GitTest\zssuretest\DICOM-Chinese>git pullAlready up2. 添加他人仓库F:\GitTest\zssuretest\DICOM-Chinese>git remote -vorigin 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-originhttps://github.com/zssure-thu/DICOM-Chinese.git (fetch)zssure-thu-originhttps://github.com/zssure-thu/DICOM-Chinese.git (push)F:\GitTest\zssuretest\DICOM-Chinese>git remote add kuangbi-mnhwa https://github.com/mnhwa/DICOM-Chinese.gitF:\GitTest\zssuretest\DICOM-Chinese>git remote -vkuangbi-mnhwa https://github.com/mnhwa/DICOM-Chinese.git (fetch)kuangbi-mnhwa https://github.com/mnhwa/DICOM-Chinese.git (push)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-originhttps://github.com/zssure-thu/DICOM-Chinese.git (fetch)zssure-thu-originhttps://github.com/zssure-thu/DICOM-Chinese.git (push)3. 下载他人仓库F:master bb0d864 Merge branch ‘master’ of https://github.com/zssure-test/DICOM-ChineseF:\GitTest\zssuretest\DICOM-Chinese>git fetch kuangbi-mnhwaremote: Counting objects: 14, done.remote: Total 14 (delta 0), reused 0 (delta 0), pack-reused 14Unpacking objects: 100% (14/14), done.From https:branch]master-> kuangbi-mnhwa/master * 4. 导出他人仓库到新的分支F:\GitTest\zssuretest\DICOM-Chinese>git checkout -b part5-kuangbi kuangbi-mnhwa/masterBranch part5Switched to a new branch ‘part5-kuangbi’F:\GitTest\zssuretest\DICOM-Chinese>git branch -v masterbb0d864 Merge branch c23aba 5. 合并他人仓库F:\GitTest\zssuretest\DICOM-Chinese>git checkout masterSwitched to branch ‘master’Your branch is upF:masterbb0d864 Merge branch ‘master’ of https://github.com/zssure-test/DICOM-Chinese part5F:\GitTest\zssuretest\DICOM-Chinese>git merge part5-kuangbiMerge made by the ‘recursive’ strategy. Figure/Part t Structures and Encoding.md” | 353 +++++++++++++++++++++ 2 files changed, 353 insertions(+) create mode 100644 Figure/Part 5/PS3.5_Table 6.1_1.jpg create mode 100644 “Part Structures and Encoding.md”6. 提交修改到github中心仓库F:\GitTest\zssuretest\DICOM-Chinese>git statusOn branch masterYour branch is ahead of commits. (use “git push” to publish your local commits)nothing to commit, working directory cleanF:\GitTest\zssuretest\DICOM-Chinese>git push originUsername for ‘https://github.com’: zssure-testPassword for ‘https://zssure-test@github.com’:Counting objects: 19, done.Delta compression using up to 8 threads.Compressing objects: 100% (15/15), done.Writing objects: /s, done.Total 16 (delta 6), reused 0 (delta 0)To https://github.com/zssure-test/DICOM-Chinese.git bb0d864..63368d4 master -> masterF:\GitTest\zssuretest\DICOM-Chinese>请求他人合并自己的Github仓库(Pull Requests on Github):经验是由痛苦中粹取出来的

DICOM:DICOM3.0标准中文版开源书籍编辑之”github仓库合并“

相关文章:

你感兴趣的文章:

标签云: