From ea0b440c141b61cc2d9ae0dc2e3af14775ced72d Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Wed, 28 Oct 2020 11:17:11 +0100 Subject: [PATCH] set latest version while merging --- src/vs/platform/userDataSync/common/extensionsMerge.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/platform/userDataSync/common/extensionsMerge.ts b/src/vs/platform/userDataSync/common/extensionsMerge.ts index f5ebdcf74e7..8b10a4c30f1 100644 --- a/src/vs/platform/userDataSync/common/extensionsMerge.ts +++ b/src/vs/platform/userDataSync/common/extensionsMerge.ts @@ -86,7 +86,7 @@ export function merge(localExtensions: ISyncExtensionWithVersion[], remoteExtens const remoteExtension = remoteExtensionsMap.get(key)!; return { ...(updatedInRemote ? remoteExtension : localExtension), - version: localExtension.version, + version: remoteExtension.version && semver.gt(remoteExtension.version, localExtension.version) ? localExtension.version : localExtension.version, state: mergeExtensionState(localExtension, remoteExtension, lastSyncExtensionsMap?.get(key)) };