144
const handledConflicts: Set<string> = new Set<string>();
145
const handleConflict = (conflictKey: string): void => {
147
>
const resolvedConflict = resolvedConflicts.filter(({ key }) => key === conflictKey)[0];
148
>
if (resolvedConflict) {
149
localContent = contentUtil.edit(localContent, [conflictKey], resolvedConflict.value, formattingOptions);
150
remoteContent = contentUtil.edit(remoteContent, [conflictKey], resolvedConflict.value, formattingOptions);
152
>
conflicts.set(conflictKey, { key: conflictKey, localValue: local[conflictKey], remoteValue: remote[conflictKey] });
153
>
}
154
>
};
155
156
// Removed settings in Local