-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Chapter 2 section 1 #1
Open
bestony
wants to merge
5
commits into
LCTT:master
Choose a base branch
from
bestony:chapter-2
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,59 @@ | ||||||
# 版本控制工具选择 | ||||||
|
||||||
## 版本控制工具的历史 | ||||||
|
||||||
如果你到 Wikipedia 上的[版本控制软件比较][1]页面去看,会发现历史上有非常多的版本控制工具,不过对于目前这个时代的程序员,接触过的不多。 | ||||||
|
||||||
最为人所熟知的大概有以下几种: | ||||||
|
||||||
- CVS : 仅保留维护,不增加新的功能 | ||||||
- Fossil: 活跃中 | ||||||
- Git : 活跃中 | ||||||
- Mercurial: 活跃中 | ||||||
- SVN:活跃中 | ||||||
- Team Foundation Server:活跃中 | ||||||
|
||||||
其他的服务在主流中使用的人并不多,我们就不在这里提了。如果你有兴趣,可以点击上面的链接,去了解其各自的历史。 | ||||||
|
||||||
## Git & SVN | ||||||
|
||||||
历史上存在过的那么多种版本控制工具,时至今日,使用的比较多的也仅有 Git 和 SVN 了。 | ||||||
|
||||||
### Git | ||||||
|
||||||
[Git][2] 是由 Linux Kernel 的开发者 Linus Torvalds 开发的一款开源软件。最早是为了解决 Linux Kernel 的全球维护的问题,开发出了这么一款分布式的版本控制工具。 | ||||||
|
||||||
### SVN | ||||||
|
||||||
[SVN][3] 的全称为 Apache Subversion, 于 2009 年被 Apache 基金会收入旗下,并开始孵化,在2010年成为 Apache 基金会的顶级项目。 | ||||||
|
||||||
### Git 于 SVN 的对比 | ||||||
|
||||||
| 特性 | Git | SVN | | ||||||
| --- | --- | ---| | ||||||
| 版本库 | 无限个版本库| 一个中央版本库| | ||||||
| 分支| 可以有无限制分支 | 不同的目录是不同的分支| | ||||||
| 空间占用 | 小 | 大 | | ||||||
| 权限管理 | 无严格的权限管理方案,仅可以划分不同的角色 | 支持严格的权限控制,可以对子目录进行权限限制| | ||||||
|
||||||
|
||||||
## 如何选择 | ||||||
|
||||||
无论你使用哪一种版本控制的方案,只要能够满足你的需求,都是OK的。不过,如果你还没有选择,那么我向你推荐 Git 。Git 目前拥有两个大杀器: GitHub 和 Gitlab。 | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
|
||||||
- Github 是目前最为活跃的 Git 社交平台,上面每天都有大量的开发者在沟通、开发、协作,也是目前比较受认可的开发平台。 | ||||||
- Gitlab 则是一个非常专业的 Git 在线管理工具,提供了 SaaS 服务和可私有部署的开源版本。 | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
|
||||||
## 一些学习资料 | ||||||
|
||||||
### Git | ||||||
|
||||||
- Pro Git 2: https://git-scm.com/book/zh/v2 | ||||||
|
||||||
### SVN | ||||||
|
||||||
- Version Control With Subversion: http://svnbook.red-bean.com/ | ||||||
|
||||||
[1]:https://zh.wikipedia.org/wiki/%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6%E8%BD%AF%E4%BB%B6%E6%AF%94%E8%BE%83 | ||||||
[2]:https://zh.wikipedia.org/wiki/Git | ||||||
[3]:https://zh.wikipedia.org/wiki/Subversion |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.