42
};
43
}
45
>
const baseToLocal = compare(base, local);
46
>
const baseToRemote = compare(base, remote);
47
>
48
>
const remoteAdded: IStringDictionary<string> = {};
49
>
const remoteUpdated: IStringDictionary<string> = {};
50
>
const remoteRemoved: Set<string> = new Set<string>();
51
>
52
>
const conflicts: Set<string> = new Set<string>();
53
>
54
>
// Removed snippets in Local
55
>
for (const key of baseToLocal.removed.values()) {
56
// Conflict - Got updated in remote.
57
if (baseToRemote.updated.has(key)) {