您要查找的是不是：
- Conflict问题conflict problem
- 如果项目只有删除冲突而没有conflict_table行,则结果集中conflict_table的名称为NULL。If the article has only delete conflicts and no conflict_table rows, the name of the conflict_table in the result set is NULL.
- resolve_conflict以下脚本通过将旧行和新行之间的差加到统一数据库的数量值中来解决冲突Resolve_conflict The following script resolves the conflict by adding the difference between new and old rows to the quantity value in the consolidated database
- “Conflict”的动词意义和名词意义之间的区别在于，重音在最终的（或者最后的）音节上。A distinction between the verb and noun senses of "conflict" is that in the verb the stress is on the ultimate (or last) syllable.
- 那个乐曲中最后的奏鸣曲；‘conflict’的动词意义和名词意义的区别在于动词的重音在最后一个音节。the ultimate sonata of that opus; a distinction between the verb and noun senses of'conflict'is that in the verb the stress is on the ultimate (or last) syllable.
- 它们包括:product_conflict表(在解决冲突时使用的临时表)和一组属于用户mlmaint的用于监控MobiLink活动的表。These include the product_conflict table, which is a temporary table used during conflict resolution, and a set of tables for monitoring MobiLink activities owned by a user named mlmaint.
