翻譯 第三章 第四節 分支工作流程 #31
Open
Conversation
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
| @@ -1,63 +1,63 @@ | |||
| === 分支工作流程 | |||
|
|
|||
| Now that you have the basics of branching and merging down, what can or should you do with them? | |||
| In this section, we'll cover some common workflows that this lightweight branching makes possible, so you can decide if you would like to incorporate it into your own development cycle. | |||
| 現在你已經熟練了分支（branch）和合併（merge）的基本用法，你可以或者你應該用它來做點什麼呢？ | |||
There was a problem hiding this comment.
OK
話說回來，你不想要先 review 3.3 嗎?
| It's used to pull in topic branches (short-lived branches, like your earlier `iss53` branch) when they're ready, to make sure they pass all the tests and don't introduce bugs. | ||
| 許多 Git 開發者都喜歡用這種方式來工作，比如只在 `master` 分支中保持完全穩定的程式碼——亦即已經發行或即將發行的程式碼； | ||
| 他們還會有其它平行的長期分支，像是 `develop` 用於後續的開發，或者 `next` 用於測試穩定性——這種分支並不一定要一直保持穩定性，不過一旦進入穩定狀態，便可以把它合併到 `master` 裡； | ||
| 它也被用來引進已完成的主題分支（短期分支，比如之前的 `iss53` 分支），並確保它們能通過測試而不會引入臭蟲。 |
There was a problem hiding this comment.
「引進」→「拉取」
「臭蟲」傾向保留 bug 不翻耶
There was a problem hiding this comment.
「引進」→「拉取」
根據上下文，以及英文用的是「pull in」，我覺得不是在講 git 的 pull，所以不翻成「拉取」(翻成「拉取」其實也怪怪的)
「臭蟲」傾向保留 bug 不翻耶
OK
There was a problem hiding this comment.
「合併」用到有點快爛掉的感覺，要不要考慮「整合」、「引入」、「導入」?
(pull in 參考例句: http://tw.websaru.com/pull%20in.html)
taichunmin
requested changes
Dec 18, 2017
|
|
||
| In reality, we're talking about pointers moving up the line of commits you're making. | ||
| The stable branches are farther down the line in your commit history, and the bleeding-edge branches are farther up the history. | ||
| 實際上，我們談論的是隨著提交（commit）不斷線性向前移動的指標； |
| In reality, we're talking about pointers moving up the line of commits you're making. | ||
| The stable branches are farther down the line in your commit history, and the bleeding-edge branches are farther up the history. | ||
| 實際上，我們談論的是隨著提交（commit）不斷線性向前移動的指標； | ||
| 在提交歷史中，穩定分支總是落後一大截，而前沿分支則是超前一大截。 |
There was a problem hiding this comment.
有點想幫 bleeding-edge branches 找個更貼切的詞，「不穩定分支」覺得如何?
There was a problem hiding this comment.
「前沿」 -> 味道確實不夠重!!! :P
There was a problem hiding this comment.
「不穩定」的用例:
Fedora另外還有個用來放置不穩定（Bleeding-Edge）軟體的套件庫稱為Rawhide ...
|
|
||
| It's generally easier to think about them as work silos, where sets of commits graduate to a more stable silo when they're fully tested. | ||
| 一般而言，把它們想像成工作流水線會比較好理解，當這些提交經過完整的測試後便可以前進到更穩定的流水線中。 |
| You did a few commits on them and deleted them directly after merging them into your main branch. | ||
| This technique allows you to context-switch quickly and completely – because your work is separated into silos where all the changes in that branch have to do with that topic, it's easier to see what has happened during code review and such. | ||
| You can keep the changes there for minutes, days, or months, and merge them in when they're ready, regardless of the order in which they were created or worked on. | ||
| 你已見識過在上一節中所建立的 `iss53` 和 `hotfix` 分支便是這樣的用法： |
There was a problem hiding this comment.
這樣翻譯會不會比較好呢？
「你已經看過你在上一章節所建立的 iss53 和 hotfix 這兩個主題分支」
| This technique allows you to context-switch quickly and completely – because your work is separated into silos where all the changes in that branch have to do with that topic, it's easier to see what has happened during code review and such. | ||
| You can keep the changes there for minutes, days, or months, and merge them in when they're ready, regardless of the order in which they were created or worked on. | ||
| 你已見識過在上一節中所建立的 `iss53` 和 `hotfix` 分支便是這樣的用法： | ||
| 在這二支個分支上做了一些提交，並在合併到主分支後刪除它們； |
| 你已見識過在上一節中所建立的 `iss53` 和 `hotfix` 分支便是這樣的用法： | ||
| 在這二支個分支上做了一些提交，並在合併到主分支後刪除它們； | ||
| 該技術可以讓你迅速地且完整地進行內容切換——因為你的工作被隔離在不同的流水線中，使得該分支裡的所有變更都只和它的主題相關；並且在諸如程式碼審核的過程中，它也讓檢視修改內容變得更簡單了； | ||
| 你可以在主題分支中保留修改的內容幾分鐘、幾天，或幾個月，等它們準備好之後再將它們合併，而不用在乎它們被建立或工作的順序。 |
There was a problem hiding this comment.
「你可以在主題分支中保留修改的內容」修改成「你可以在主題分支中把修改的內容保留」
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.