Lines Matching full:conflict
78 // name-conflict files which has same base file name.
472 // First base-name-conflict resolving, use 1 as initial ordinal number.
476 // We have met same base-name conflict, use latest ordinal number.
495 // Resolved name conflict.
