Extent of keybindingsMerge.test|title=KeybindingsMerge - No Conflicts merge when multiple new entries are added to local from base and remote is not changed|occurrence=1, keybindingsMerge.test|title=KeybindingsMerge - No Conflicts merge when an entry (with same command) is removed from local from base and remote has not changed|occurrence=1, +1

All 3145 source ranges in this concept · page 62 of 63.

Source rangeIntroduced
src/vs/base/common/ternarySearchTree.ts:215-216 Inherited ternarySearchTree.ts ×60
src/vs/base/common/arrays.ts:621-630 Inherited map.ts ×97
src/vs/platform/configuration/common/configurationModels.ts:1123-1124 Inherited configurationModels.ts ×92
src/vs/base/common/jsonEdit.ts:1-10 Inherited jsonEdit.ts ×5
src/vs/base/parts/storage/common/storage.ts:227-230 Inherited storage.ts ×41
src/vs/platform/workspace/common/workspace.ts:444-445 Inherited workspace.ts ×27
src/vs/base/common/event.ts:656-657 Inherited event.ts ×93
src/vs/platform/userDataSync/common/keybindingsSync.ts:222-223 Inherited abstractSynchronizer.ts ×49
src/vs/base/common/async.ts:181-187 Inherited async.ts ×202
src/vs/base/common/lifecycle.ts:140-141 Inherited map.ts ×97
src/vs/platform/contextkey/common/contextkey.ts:985-997 Inherited contextkey.ts ×201
src/vs/platform/contextkey/common/contextkey.ts:1487-1488 Inherited contextkey.ts ×201
src/vs/platform/userDataSync/common/settingsSync.ts:323 Inherited abstractSynchronizer.ts ×49
src/vs/platform/userDataSync/common/keybindingsSync.ts:178-179 Inherited abstractSynchronizer.ts ×49
src/vs/platform/uriIdentity/common/uriIdentityService.ts:126-128 Inherited uriIdentityService.ts ×6
src/vs/platform/extensionManagement/common/extensionManagement.ts:715-802 Inherited extensionManagement.ts ×10
src/vs/platform/userDataSync/common/extensionsSync.ts:332-333 Inherited abstractSynchronizer.ts ×49
src/vs/base/test/common/virtualScheduling/virtualClock.ts:79-82 Inherited processor.ts ×17
src/vs/platform/contextkey/common/contextkey.ts:1058-1062 Inherited contextkey.ts ×201
src/vs/base/common/types.ts:21-25 Inherited map.ts ×97
src/vs/platform/configuration/common/configurationModels.ts:714-715 Inherited configurationModels.ts ×92
src/vs/base/common/ternarySearchTree.ts:129-130 Inherited ternarySearchTree.ts ×60
src/vs/base/common/lifecycle.ts:106-107 Inherited map.ts ×97
src/vs/platform/extensions/common/extensions.ts:561-562 Inherited extensions.ts ×24
src/vs/platform/userDataSync/common/globalStateSync.ts:283-284 Inherited abstractSynchronizer.ts ×49
src/vs/nls.ts:38 Inherited nls.ts ×1
src/vs/base/common/async.ts:1051-1052 Inherited async.ts ×202
src/vs/base/common/iterator.ts:130-134 Inherited map.ts ×97
src/vs/base/common/lifecycle.ts:864-870 Inherited map.ts ×97
src/vs/platform/contextkey/common/contextkey.ts:747-748 Inherited contextkey.ts ×201
src/vs/base/test/common/virtualScheduling/virtualClock.ts:111-116 Inherited processor.ts ×17
src/vs/platform/files/common/files.ts:862-863 Inherited files.ts ×41
src/vs/platform/contextkey/common/scanner.ts:382-383 Inherited scanner.ts ×11
src/vs/platform/configuration/common/configurationModels.ts:610-612 Inherited configurationModels.ts ×92
src/vs/base/common/async.ts:2744-2746 Inherited async.ts ×202
src/vs/platform/contextkey/common/contextkey.ts:239-241 Inherited contextkey.ts ×15
src/vs/base/common/platform.ts:187-219 Inherited map.ts ×97
src/vs/base/common/event.ts:1903-1904 Inherited event.ts ×93
src/vs/platform/userDataSync/common/userDataSyncStoreService.ts:311-312 Inherited abstractSynchronizer.ts ×49
src/vs/platform/contextkey/common/contextkey.ts:593 Inherited contextkey.ts ×201
src/vs/platform/request/common/request.ts:204-225 Inherited request.ts ×15
src/vs/base/common/arrays.ts:413-414 Inherited map.ts ×97
src/vs/platform/log/common/log.ts:833-834 Inherited log.ts ×72
src/vs/platform/instantiation/common/instantiationService.ts:115-118 Inherited instantiationService.ts ×21
src/vs/platform/userDataProfile/common/userDataProfile.ts:616-617 Inherited userDataProfile.ts ×28
src/vs/base/common/path.ts:345-346 Inherited map.ts ×97
src/vs/base/common/async.ts:517-518 Inherited async.ts ×202
src/vs/base/common/cancellation.ts:127-128 Inherited cancellation.ts ×18
src/vs/platform/configuration/common/configurationModels.ts:650-651 Inherited configurationModels.ts ×92
src/vs/platform/files/common/files.ts:1045-1046 Inherited files.ts ×41