Each team has their own work branch, since they each need somewhere to test their code before publishing to the trunk.
由于每个团队都要在发布代码到主干前进行测试,因此他们有各自的工作分支。
Later, moving changes from one branch to another branch (or the main trunk) is performed by the merging operation.
稍后,由合并操作将更改从一个分支迁移到另一个分支(或主干)。
At that point we can (and should) publish to the trunk, i.e. take all new code on the work branch and copy over to the trunk.
此时我们可以(而且应该)将此分支公开发布到主干上,比如将工作分支上所有的新代码复制到主干上。
Creating a branch based on a release tag is similar, in technique, to creating a tag based on the trunk.
在技术上,根据版本标记创建分支与根据主干创建标记是相似的。
The important thing is that my team is responsible for getting the problem sorted out, and that we need to sort it out on our own work branch (not on the trunk).
重要之处在于我的团队要负责解决问题,而且我们要在自己的工作分支上(而不是在主干上)完成。
As soon as a story is implemented and tested on the work branch we copy everything from work to trunk.
只要这个故事相关的代码在工作分支上完成实现并通过测试,我们把所有的相关内容从工作分支上复制到主干上就可以了。
But if you love the urban tree, as I do, the plane tree steels the show - the array of colours on its bark, the green of the leaf, the girth of the trunk, the hang of the branch.
如果你像我一样喜欢城市里的树木,你可以看到,树木上的陈列的颜色,葱郁的树叶,树干的线条,以及那些悬挂着的枝杈。
Demonstrations of applying changes from branch back to the trunk.
演示如何将源于分支的变更应用到主干?
Merge changes from branch back to the trunk.
将分支的变更合并到主干。
Eclipse now downloads all the source files from the branch, trunk, or tag you've selected.
Eclipse现在从您选择的分支、主干或标记中下载所有源文件。
How to run Continuous Integration (CI) against a branch that is under development and regularly test the merge against the trunk?
如何在开发中的主干运行持续集成(Continuous Integration,CI),以定期测试分支与主干的合并?
All right, so "the Other Ted" is frisky and wants to add a new file in the master branch (roughly equivalent to SVN's TRUNK) and also make a new branch with some changes to the gdbinit file.
好的,现在让我们将一个新文件添加到主分支中(相当于SVN的TRUNK)并通过对gdbinit文件作出一些修改来生成一个新分支。
And, before you ask, we're planning on contributing all these changes back to Lucene; some of which have already made it into Lucene's trunk and its new realtime branch.
而且,在大家要求之前,我们已经计划将所有的修改贡献给Lucene;有一些代码已经写入Lucene最新的开发分支,和新的实时版本。
However, most of the time, you'll want to work on the main branch (what CVS calls the HEAD), so select trunk, and click Next.
而大多数时候,您都希望在主分支上工作(CVS称之为HEAD),因此选择trunk并单击Next。
Theoretically this should be fine since the trunk is the Done branch and the definition of Done is "releasable".
理论上来说,这样做没有问题;因为主干是“完成”分支,而“完成”的定义就是“可发布的”。
When one developer changes files on a branch, those changes do not appear on the main trunk or on other branches.
当一个开发人员更改某个分支上的文件时,这种更改不会出现在主干或其它分支上。
You can experiment in a branch off the main trunk without interfering with other team members.
您可以在不触及主干的分支中进行试验,而不会影响到其他小组成员。
Rule: Merge from your work branch to the trunk on a regular basis, for example whenever a story is done.
规则:经常从工作分支向主干合并代码,例如每完成一个故事之后。
Annabel and Julia climbed on the tree and rested on a branch while Trevor and Lionel sat on the ground, leaning on the trunk.
安娜·贝利和茱莉亚爬上树,找了个树枝休息,而特雷福和莱昂内尔则坐在地上,靠着树干。
Create a release branch called release 1.0, based on the trunk at the time it was released.
创建一个名为“发布1.0”的发布分支,基于它在发布时的主干内容。
In a CVS repository, for example, a stream maps to the main trunk HEAD or to a branch.
例如,在CVS资源库中,一条流可以对应为干线HEAD,也可以对应为分支。
The elephant can also use its trunk to grasp an entire tree branch and pull it down to its mouth.
大象也会用他的鼻子抓住整个树枝塞到嘴里。
Traditionally, biologists have celebrated the trunk, branch and twig system of a tree as no accident.
以往生物学家赞美树的干枝系统非常完美。
At that point we can (and should) publish to the trunk, i. e. take all new code on the work branch and copy over to the trunk.
此时我们可以(而且应该)将此分支公开发布到主干上,比如将工作分支上所有的新代码复制到主干上。
One stable branch (the trunk) and one slightly less stable branch (the team branch).
一个稳定的分支(主干)和一个稍微不那么稳定的分支(团队分支)。
A special branch, referred to as head, represents the main course of work in the repository (a head is often referred to as the trunk).
一个称为HEAD的特殊分支用来表示资源库中的主要工作流程(HEAD通常被称为主干)。
Do not commit changes (from a branch merge) to the trunk which may break it?
不要提交一些可能破坏trunk的内容,例如从branch合并。
If you need to alter your application or develop a new feature for it, create a new branch from the trunk, and make your development on that branch.
如果你需要修改你的应用程序,或者为它开发一个新的特性,请从trunk中创建一个新的branch,然后基于这个新的分支进行开发。
If you need to alter your application or develop a new feature for it, create a new branch from the trunk, and make your development on that branch.
如果你需要修改你的应用程序,或者为它开发一个新的特性,请从trunk中创建一个新的branch,然后基于这个新的分支进行开发。
应用推荐