253
return { content: null, hasLocalChanged: false, hasRemoteChanged: false, hasConflicts: false };
254
}
256
>
const localForwarded = baseContent !== originalLocalContent;
257
>
const remoteForwarded = baseContent !== originalRemoteContent;
258
>
259
>
/* no changes */
260
if (!localForwarded && !remoteForwarded) {
261
return { content: null, hasLocalChanged: false, hasRemoteChanged: false, hasConflicts: false };
262
}
264
>
/* local has changed and remote has not */
265
if (localForwarded && !remoteForwarded) {
266
return { content: originalLocalContent, hasRemoteChanged: true, hasLocalChanged: false, hasConflicts: false };