理论上来说,这样做没有问题;因为主干是“完成”分支,而“完成”的定义就是“可发布的”。
Theoretically this should be fine since the trunk is the Done branch and the definition of Done is "releasable".
变更可能先在主干中发生,而不会先出现在我的工作分支中!
Changes might be made in the trunk, without being made in my work branch first!
当一个开发人员更改某个分支上的文件时,这种更改不会出现在主干或其它分支上。
When one developer changes files on a branch, those changes do not appear on the main trunk or on other branches.
由于每个团队都要在发布代码到主干前进行测试,因此他们有各自的工作分支。
Each team has their own work branch, since they each need somewhere to test their code before publishing to the trunk.
假定:主干作为“完成”分支。
完成后,主干与工作分支就完全相同了。
在技术上,根据版本标记创建分支与根据主干创建标记是相似的。
Creating a branch based on a release tag is similar, in technique, to creating a tag based on the trunk.
我将会使用主干作为“完成”分支(这是一个不错的开始)。
I'm going to use the trunk as the Done branch (a good starting point).
创建一个名为“发布1.0”的发布分支,基于它在发布时的主干内容。
Create a release branch called release 1.0, based on the trunk at the time it was released.
但是我们能研究研究下这个体系中衍生其他谬论分支的主谬论,即整个谬论网络体系的主干。
But we can examine here the mother fallacy that has given birth to this progeny, the main stem of the network.
当有人考虑从工作分支向主干发布代码时,要触发该手工测试,以检查故事是否“完成”。
This test is triggered manually whenever someone is considering to publish code from work to trunk, as a way to check that the story is Done.
规则:每天都从主干向你的工作分支中合并代码。
演示如何将源于分支的变更应用到主干?
Demonstrations of applying changes from branch back to the trunk.
将分支的变更合并到主干。
Eclipse现在从您选择的分支、主干或标记中下载所有源文件。
Eclipse now downloads all the source files from the branch, trunk, or tag you've selected.
一个称为HEAD的特殊分支用来表示资源库中的主要工作流程(HEAD通常被称为主干)。
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).
此时我们可以(而且应该)将此分支公开发布到主干上,比如将工作分支上所有的新代码复制到主干上。
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.
稍后,由合并操作将更改从一个分支迁移到另一个分支(或主干)。
Later, moving changes from one branch to another branch (or the main trunk) is performed by the merging operation.
您可以在不触及主干的分支中进行试验,而不会影响到其他小组成员。
You can experiment in a branch off the main trunk without interfering with other team members.
重要之处在于我的团队要负责解决问题,而且我们要在自己的工作分支上(而不是在主干上)完成。
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).
规则:经常从工作分支向主干合并代码,例如每完成一个故事之后。
Rule: Merge from your work branch to the trunk on a regular basis, for example whenever a story is done.
只要这个故事相关的代码在工作分支上完成实现并通过测试,我们把所有的相关内容从工作分支上复制到主干上就可以了。
As soon as a story is implemented and tested on the work branch we copy everything from work to trunk.
隔几周你就想将分支合并到主干上一下。
Every few weeks you want to merge from the branch into the trunk.
如何在开发中的主干运行持续集成(Continuous Integration,CI),以定期测试分支与主干的合并?
How to run Continuous Integration (CI) against a branch that is under development and regularly test the merge against the trunk?
一个稳定的分支(主干)和一个稍微不那么稳定的分支(团队分支)。
One stable branch (the trunk) and one slightly less stable branch (the team branch).
此时我们可以(而且应该)将此分支公开发布到主干上,比如将工作分支上所有的新代码复制到主干上。
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.
为了突出主干和分支网络的特殊性,提出了节理单元模型并专门推导了节理单元的连续性方程。
A joint element is presented to represent the trunk and branch networks and used to derive the continuity equation for these two network systems.
结果眼直肌的动脉主干主要来自眼动脉本干,也可以发自泪腺动脉、视网膜中央动脉、睫状后动脉等较大的动脉分支。
Result The origin of rectus muscular artery was the trunk of ophthalmic artery, sometimes from the lacrimal artery, central artery of the retina and posterior ciliary artery.
结果彩色多普勒超声显示门静脉主干及周围分支呈蜂窝状、多条迂曲扩张的管状结构,内充满门静脉样血流。
Results color Doppler ultrasound showed honeycomb-shaped, the multi-strip expansion tube structure within filled with the portal vein type blood stream around main portal pain and branches.
实验结果表明,该方法可有效地自动提取视网膜血管主干和主要分支。
Experimental results indicate that the method can automatically and effectively extract most of the vessel backbones and branches.
应用推荐