Extent of keybindingsMerge.test|title=KeybindingsMerge - No Conflicts merge when the entry is removed in local but updated in remote and a new entry is added in local|occurrence=1

All 3055 source ranges in this concept · page 22 of 62.

Source rangeIntroduced
src/vs/platform/contextkey/common/contextkey.ts:1529-1530 Inherited contextkey.ts ×201
src/vs/base/common/resources.ts:219-220 Inherited resources.ts ×23
src/vs/base/common/async.ts:1578-1581 Inherited async.ts ×202
src/vs/platform/userDataSync/common/settingsMerge.ts:69-70 Inherited settingsMerge.ts ×19
src/vs/platform/extensionManagement/common/extensionStorage.ts:169-170 Inherited abstractSynchronizer.ts ×49
src/vs/base/common/lifecycle.ts:710-723 Inherited map.ts ×97
src/vs/base/common/network.ts:180-192 Inherited network.ts ×20
src/vs/base/common/lifecycle.ts:453 Inherited lifecycle.ts ×4
src/vs/base/common/event.ts:633-636 Inherited event.ts ×93
src/vs/platform/extensionManagement/common/extensionManagementUtil.ts:1-18 Inherited extensionManagementUtil.ts ×17
src/vs/base/common/hash.ts:154-155 Inherited hash.ts ×17
src/vs/base/common/buffer.ts:177-178 Inherited buffer.ts ×42
src/vs/platform/userDataSync/common/abstractSynchronizer.ts:501-502 Inherited abstractSynchronizer.ts ×49
src/vs/platform/userDataSync/common/globalStateMerge.ts:1-16 Inherited globalStateMerge.ts ×2
src/vs/base/common/ternarySearchTree.ts:178-179 Inherited ternarySearchTree.ts ×60
src/vs/platform/contextkey/common/contextkey.ts:1469-1470 Inherited contextkey.ts ×201
src/vs/platform/configuration/common/configurationRegistry.ts:878 Inherited configurationRegistry.ts ×17
src/vs/platform/files/common/files.ts:398-592 Inherited files.ts ×41
src/vs/platform/userDataSync/common/snippetsSync.ts:470-471 Inherited abstractSynchronizer.ts ×49
src/vs/base/common/path.ts:1212 Inherited path.ts ×3
src/vs/base/common/errors.ts:122-126 Inherited map.ts ×97
src/vs/base/test/common/virtualScheduling/processor.ts:1-64 Inherited processor.ts ×17
src/vs/base/common/lifecycle.ts:71-72 Inherited map.ts ×97
src/vs/base/common/async.ts:480-481 Inherited async.ts ×202
src/vs/base/common/map.ts:47-77 Inherited map.ts ×97
src/vs/base/common/map.ts:187-188 Inherited map.ts ×97
src/vs/platform/configuration/common/configurations.ts:79-88 Inherited configurations.ts ×19
src/vs/platform/storage/common/storage.ts:563-565 Inherited storage.ts ×41
src/vs/base/common/buffer.ts:201-207 Inherited buffer.ts ×42
src/vs/base/common/map.ts:881-888 Inherited map.ts ×97
src/vs/platform/userDataSync/common/userDataSyncEnablementService.ts:54-55 Inherited abstractSynchronizer.ts ×49
src/vs/platform/contextkey/common/contextkey.ts:722-732 Inherited contextkey.ts ×201
src/vs/platform/configuration/common/configurationModels.ts:1242-1243 Inherited configurationModels.ts ×92
src/vs/platform/configuration/common/configurationService.ts:91-96 Inherited configurationService.ts ×18
src/vs/platform/configuration/common/configurations.ts:75-76 Inherited configurations.ts ×19
src/vs/platform/log/common/log.ts:727-728 Inherited log.ts ×72
src/vs/platform/files/common/files.ts:848-849 Inherited files.ts ×41
src/vs/platform/configuration/common/configurationRegistry.ts:768-771 Inherited configurationRegistry.ts ×7
src/vs/platform/storage/common/storage.ts:613-614 Inherited storage.ts ×41
src/vs/base/common/arrays.ts:33 Inherited arrays.ts ×2
src/vs/platform/contextkey/common/contextkey.ts:781-782 Inherited contextkey.ts ×201
src/vs/base/common/arrays.ts:373-377 Inherited map.ts ×97
src/vs/base/common/uri.ts:120-161 Inherited map.ts ×97
src/vs/platform/userDataSync/common/ignoredExtensions.ts:31-32 Inherited abstractSynchronizer.ts ×49
src/vs/base/common/json.ts:373-376 Inherited json.ts ×1
src/vs/platform/instantiation/common/instantiationService.ts:281-282 Inherited instantiationService.ts ×21
src/vs/base/common/map.ts:794-795 Inherited map.ts ×97
src/vs/base/common/async.ts:156-157 Inherited async.ts ×202
src/vs/base/common/strings.ts:105-106 Inherited strings.ts ×101
src/vs/platform/files/common/files.ts:1657-1658 Inherited files.ts ×41