Merge down the latest from the work branch, and check in your code.
从工作分支中取得并合并最新的代码，然后检入你的代码。
Rule: Merge from your work branch to the trunk on a regular basis, for example whenever a story is done.
规则：经常从工作分支向主干合并代码，例如每完成一个故事之后。
Merge changes from branch back to the trunk.
将分支的变更合并到主干。
Do not commit changes (from a branch merge) to the trunk which may break it?
不要提交一些可能破坏trunk的内容，例如从branch合并。
They can make changes, commit them to their local repositories, and merge changes from others without affecting the main branch.
开发人员进行变更、提交变更到其本地的存储库，之后，在不影响主干的前提下，与其他开发人员的变更合并。
All backward connections into one branch of the merge should originate from the same branch of the decision to avoid implicit deadlocks or a lack of synchronization.
进入merge任意分支的所有逆向连接都应源自decision的同一分支，只有这样才能避免出现隐式死锁或缺乏同步问题。
Merge from one branch to another, a conflict can occur between the version of the file in the source branch and the version of the file in the target branch.
从一个分支合并到另一个分支时，源分支中的文件版本与目标分支中的文件版本之间可能发生冲突。
How do I merge my branch up from master?
我如何合并我的分支从主？
How do I merge my branch up from master?
我如何合并我的分支从主？
应用推荐