Merge pull request #26 from YueLinHo/3.0-git-branching

3.0 git branching

Author: taichunmin

book/03-git-branching/1-git-branching.asc

@@ -1,16 +1,16 @@
 [[_git_branching]]
-== Git 分支
+== 使用 Git 分支
 
 (((branches)))
-Nearly every VCS has some form of branching support.
-Branching means you diverge from the main line of development and continue to do work without messing with that main line.
-In many VCS tools, this is a somewhat expensive process, often requiring you to create a new copy of your source code directory, which can take a long time for large projects.
+幾乎每一種版本控制系統（Version Control System，以下簡稱 VCS）都支援某種形式的分支（branch）功能，
+使用分支意味著你可以從開發主線上分離開來，然後在不影響主線的情況下繼續工作；
+在很多 VCS 中，這是個昂貴的過程，常常需要對原始程式碼目錄建立一個完整的副本，對大型專案來說會花費很長時間。
 
-Some people refer to Git's branching model as its ``killer feature,'' and it certainly sets Git apart in the VCS community.
-Why is it so special?
-The way Git branches is incredibly lightweight, making branching operations nearly instantaneous, and switching back and forth between branches generally just as fast.
-Unlike many other VCSs, Git encourages workflows that branch and merge often, even multiple times in a day.
-Understanding and mastering this feature gives you a powerful and unique tool and can entirely change the way that you develop.
+有人把 Git 的分支模型視為它的「殺手級功能」，正是因為它而讓 Git 在 VCS 社群中顯得與眾不同。
+它有何特別之處呢？
+Git 的分支簡直是難以置信的羽量級，新建分支的操作幾乎可以在瞬間完成，並且一般來說切換不同分支也很快；
+跟其它的 VCS 不一樣的地方是 Git 鼓勵在工作流程中頻繁地使用分支與合併（merge），即使一天之內進行許多次都沒問題。
+理解並掌握這個特性後，它會給你一個強大而獨特的工具，從此完全地改變你的開發方式。
 
 include::sections/nutshell.asc[]
 
@@ -24,9 +24,9 @@ include::sections/remote-branches.asc[]
 
 include::sections/rebasing.asc[]
 
-=== Summary
+=== 總結
 
-We've covered basic branching and merging in Git.
-You should feel comfortable creating and switching to new branches, switching between branches and merging local branches together.
-You should also be able to share your branches by pushing them to a shared server, working with others on shared branches and rebasing your branches before they are shared.
-Next, we'll cover what you'll need to run your own Git repository-hosting server.
+我們已介紹 Git 基本的分支和合併，
+你應該對於「建立並切換到新分支」、「在不同分支之間切換」、「合併本地分支」感到相當輕鬆寫意；
+你應該也能夠做到「把想要分享的分支推送到共用伺服器上」、「在共享的分支上與其他人協作」、「在分享自己的分支前先進行變基（rebase）」。
+下一章我們將介紹架設自己的 Git 版本庫託管伺服器所需要的知識。

status.json

@@ -24,7 +24,7 @@
       "sections/viewing-history.asc": 100
     },
     "03-git-branching": {
-      "1-git-branching.asc": 1,
+      "1-git-branching.asc": 100,
       "sections/basic-branching-and-merging.asc": 1,
       "sections/branch-management.asc": 1,
       "sections/nutshell.asc": 1,