Then the conflicts (if any) will be in that merge commit rather than in your existing branch work.
然后冲突(如果有的话)将会在现有的分支合并提交，而不是工作。
That developers are always able to successfully merge and commit their changes in the integration stream without being affected by deliveries from other developers.
开发人员总能够成功地合并并在集成流中提交他们的变化，而不被其他开发人员的交付所影响。
Of course, when a development team maintains a large repository, it is necessary to have a control over commit and merge operations within projects.
当然，当开发团队维护大型资源库时，有必要控制项目内的提交和合并操作。
They can make changes, commit them to their local repositories, and merge changes from others without affecting the main branch.
开发人员进行变更、提交变更到其本地的存储库，之后，在不影响主干的前提下，与其他开发人员的变更合并。
If it's not possible to commit the merged code back to the trunk frequently, test runs can determine if any merge conflicts will occur so that merges are less painful when they are committed.
如果无法经常将代码合并到主干的话，可以运行测试，这样就能够确定是否会发生合并冲突，从而使实施合并没有那么困难。
Do not commit changes (from a branch merge) to the trunk which may break it?
不要提交一些可能破坏trunk的内容，例如从branch合并。
In this situation, the commit is rejected, requiring the developer to merge the changes by hand.
在此情况下，提交被拒绝，并要求开发人员手工合并变更。
Your source control tool should give you a chance to do these checks before you commit the final results of a merge branches operation.
你的源码控制工具应该给你一个机会去在你提交合并分支的最终结果之前检查你的工作。
If the merge is successful, you need to commit the change in Subversion, as shown in Listing 6.
如果合并成功，则需要提交Subversion中的变更，如清单6所示。
So we need to make sure that the developer is given final approval before we commit the results of our merge to the repository.
所以我们需要确信在我们提交合并结果到库里面的时候，开发人员给出了一个正式批准。
Save the merged model by clicking the Commit merge button.
点击Commit Merge按钮来保存合并的模型。
The "edit-merge-commit" teaches a lifestyle which is riskier.
修改-合并-提交提供了一种更危险一点的工作方式。
The "edit-merge-commit" teaches a lifestyle which is riskier.
修改-合并-提交提供了一种更危险一点的工作方式。
应用推荐