Lines Matching refs:conflict
11 .conflict {
20 <li><a href="#conflict">Get Notified of Conflicts</a></li>
39 <p>This article describes how to design a robust conflict resolution strategy for
50 to save data to the cloud, the saves might conflict, and you must decide how to
52 your conflict resolution can be, so you must design your data carefully in order
53 to allow your conflict resolution logic to handle each case correctly.</p>
60 <h2 id="conflict">Get Notified of Conflicts</h2>
73 // resolve conflict, then call mAppStateClient.resolveConflict()
79 up to you to implement this conflict resolution logic.</p>
84 the data. Specifically, if the Google Play services application detects a conflict
88 <p>Therefore, design of your cloud save data and conflict resolution code must be
90 to resolve the conflict using only the data available within the data sets, without
95 <p>Here are some simple cases of conflict resolution. For many apps, it is
103 save data. When resolving the conflict, pick the data set with the most recent
112 <li> <strong>Merge by union</strong>. It may be possible to resolve the conflict
137 number of coins in the bank. But if that data is all that's available, conflict
139 the two numbers in case of a conflict.</p>
144 conflict is detected. The "store only the total" conflict resolution algorithm would resolve
145 the conflict by writing 35 (the largest of the two numbers).</p>
188 <span class="conflict">Conflict detected.</span></td>
189 <td class="conflict">30</td>
191 <td class="conflict">35</td>
195 <td>Device A resolves conflict by picking largest of the two numbers.</td>
206 cloud save is not enough to implement a robust conflict resolution algorithm.</p>
216 <p>With this structure, your conflict resolution algorithm has room to be more
220 <p>Here is the conflict resolution algorithm for including the delta:</p>
228 <p>For example, when you get a conflict between the local state <em>(T,d)</em>
313 <span class="conflict">Conflict detected.</span></td>
314 <td class="conflict">(130, +10)</td>
316 <td class="conflict">(130, +5)</td>
320 <td>Device A resolves the conflict by applying the local delta to the cloud total.
391 <td class="conflict">(21, +1)</td>
392 <td class="conflict">
397 <td>Device B solves conflict by applying local delta to cloud total.
408 <span class="conflict">Conflict detected. </span></td>
409 <td class="conflict">(130, +110)</td>
411 <td class="conflict">(121, +1)</td>
415 <td>Device A resolves the conflict by applying the local delta to the cloud total.
447 <p>The new conflict resolution algorithm for the "drawer" solution is as follows:</p>
458 <em>(A:20, B:10, C:7, D:14)</em>. Note that how you apply conflict resolution
541 <span class="conflict">Conflict detected. </span></td>
543 <td class="conflict">(X:20, B:1)</td>
544 <td class="conflict">
549 <td>Device B solves conflict
559 <span class="conflict">Conflict detected.</span></td>
560 <td class="conflict">(X:20, A:110)</td>
562 <td class="conflict">
567 <td>Device A resolves the conflict