在这种情况下，并没有创建一个合并提交(merge commit)，只是更新了版本信息。 当本地分支是远端仓库(remote repository)的跟踪分支时，这种情况经常出现。
基于40个网页-相关网页
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.
当然，当开发团队维护大型资源库时，有必要控制项目内的提交和合并操作。
应用推荐