Lines Matching full:server
65 // This logic determines "client wins" vs. "server wins" strategy picking.
67 // a) We can decrypt both the local and server data (else we'd be in
79 // functional change must have been made server-side (else
81 // safely ignore the server changes as redundant.
89 // of three options: CLIENT, SERVER, or MERGE. Some datatypes (autofill)
163 DVLOG(1) << "Resolving simple conflict, ignoring server encryption "
177 DVLOG(1) << "Resolving simple conflict, overwriting server changes "
191 // Now that we've resolved the conflict, clear the prev server
200 // If a server deleted folder has local contents it should be a hierarchy
206 // The entry is deleted on the server but still exists locally.
207 // We undelete it by overwriting the server's tombstone with the local
211 DVLOG(1) << "Resolving simple conflict, undeleting server entry: "
