Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-03 16:15:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

set latest version while merging

Browse Source
This commit is contained in:
Sandeep Somavarapu
2020-10-28 11:19:14 +01:00
parent b6a02bb4e2
commit ea0b440c14
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/platform/userDataSync/common/extensionsMerge.ts
+1 -1
View File
@@ -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))
};