Lines Matching full:conflict
47 // METRIC simple conflict resolved by merge.
60 // METRIC conflict resolved by overwrite.
93 // METRIC simple conflict resolved by merge.
111 VLOG(1) << "Resolving simple conflict, ignoring local changes for:"
115 VLOG(1) << "Resolving simple conflict, overwriting server changes for:"
209 // METRIC conflict resolved by breaking dir loop.
230 // conflict was detected.
254 // METRIC conflict resolved by recreating dir tree.
276 // the conflict was detected.
296 // TODO(sync): Revisit syncer code organization to see if conflict
334 // METRIC conflict resolved by recreating dir tree.
356 // TODO(sync): Eliminate conflict sets. They're not necessary.
362 LOG(WARNING) << "Skipping conflict set because it has size " << set_size;
402 LOG(ERROR) << "[BUG] Conflict set cannot be resolved, has "
425 // First iterate over simple conflict items (those that belong to no set).
435 // We have a simple conflict.
480 // METRIC conflict sets seen ++
499 // This code means we don't signal that syncing is stuck when any conflict
511 // METRIC self resolved conflict sets ++.
