Extent of keybindingsMerge.test|title=KeybindingsMerge - No Conflicts merge when remote has moved forwareded with multiple changes and local stays with base|occurrence=1

All 3165 source ranges in this concept · page 58 of 64.

Source rangeIntroduced
src/vs/platform/contextkey/common/contextkey.ts:1048-1049 Inherited contextkey.ts ×1
src/vs/platform/files/common/fileService.ts:1475-1476 Inherited fileService.ts ×18
src/vs/base/common/json.ts:871-872 Inherited json.ts ×2
src/vs/platform/contextkey/common/contextkey.ts:1640 Inherited contextkey.ts ×4
src/vs/platform/log/common/log.ts:387-398 Inherited log.ts ×72
src/vs/platform/userDataSync/common/abstractSynchronizer.ts:1-40 Inherited abstractSynchronizer.ts ×49
src/vs/platform/registry/common/platform.ts:37-42 Inherited platform.ts ×1
src/vs/platform/contextkey/common/contextkey.ts:1552-1553 Inherited contextkey.ts ×201
src/vs/platform/contextkey/common/contextkey.ts:285-286 Inherited contextkey.ts ×201
src/vs/base/common/platform.ts:248-260 Inherited map.ts ×97
src/vs/base/common/path.ts:159-161 Inherited path.ts ×3
src/vs/base/common/map.ts:269-270 Inherited map.ts ×97
src/vs/base/common/errors.ts:1-23 Inherited map.ts ×97
src/vs/base/common/json.ts:858-860 Inherited json.ts ×8
src/vs/platform/remote/common/remoteHosts.ts:59-60 Inherited remoteHosts.ts ×7
src/vs/platform/instantiation/test/common/instantiationServiceMock.ts:104-105 Inherited instantiationServiceMock.ts ×18
src/vs/platform/userDataSync/common/promptsSync/promptsSync.ts:114-115 Inherited abstractSynchronizer.ts ×49
src/vs/platform/userDataSync/common/settingsMerge.ts:297 Inherited settingsMerge.ts ×19
src/vs/platform/workspace/common/workspace.ts:411-429 Inherited workspace.ts ×27
src/vs/platform/storage/common/storageIpc.ts:196-197 Inherited storageIpc.ts ×22
src/vs/base/common/map.ts:145-146 Inherited map.ts ×97
src/vs/platform/userDataSync/common/keybindingsMerge.ts:53 Inherited keybindingsMerge.ts ×12
src/vs/base/common/event.ts:248-269 Inherited event.ts ×93
src/vs/platform/userDataSync/common/tasksSync.ts:32-35 Inherited abstractSynchronizer.ts ×49
src/vs/platform/userDataSync/common/promptsSync/promptsSync.ts:495-496 Inherited abstractSynchronizer.ts ×49
src/vs/platform/log/common/log.ts:75-90 Inherited log.ts ×72
src/vs/platform/contextkey/common/scanner.ts:164 Inherited scanner.ts ×13
src/vs/platform/contextkey/common/scanner.ts:300-303 Inherited scanner.ts ×36
src/vs/platform/contextkey/common/contextkey.ts:1226-1227 Inherited contextkey.ts ×201
src/vs/platform/userDataSync/common/extensionsSync.ts:79-80 Inherited abstractSynchronizer.ts ×49
src/vs/base/common/uri.ts:393-408 Inherited map.ts ×97
src/vs/platform/instantiation/common/instantiation.ts:119-120 Inherited instantiation.ts ×4
src/vs/base/common/jsonSchema.ts:266-269 Inherited jsonSchema.ts ×3
src/vs/base/test/common/virtualScheduling/recordingTimeApi.ts:1-33 Inherited processor.ts ×17
src/vs/platform/configuration/common/configurationRegistry.ts:884 Inherited configurationRegistry.ts ×17
src/vs/base/common/buffer.ts:426-431 Inherited buffer.ts ×42
src/vs/platform/instantiation/common/instantiationService.ts:72-73 Inherited instantiationService.ts ×21
src/vs/base/common/async.ts:2172-2173 Inherited async.ts ×202
src/vs/platform/userDataSync/common/userDataSyncService.ts:598-599 Inherited abstractSynchronizer.ts ×49
src/vs/base/common/uri.ts:223-225 Inherited uri.ts ×14
src/vs/base/common/async.ts:1249-1250 Inherited async.ts ×202
src/vs/base/common/types.ts:237-241 Inherited map.ts ×97
src/vs/base/common/lifecycle.ts:232-233 Inherited map.ts ×97
src/vs/base/common/cancellation.ts:168-173 Inherited cancellation.ts ×18
src/vs/base/common/json.ts:1012-1016 Inherited json.ts ×14
src/vs/platform/userDataSync/common/keybindingsMerge.ts:49 Inherited keybindingsMerge.ts ×12
src/vs/platform/userDataSync/common/userDataSyncService.ts:157-158 Inherited abstractSynchronizer.ts ×49
src/vs/platform/meteredConnection/common/meteredConnection.ts:110-111 Inherited abstractSynchronizer.ts ×49
src/vs/platform/request/common/request.ts:183 Inherited request.ts ×15
src/vs/platform/contextkey/common/contextkey.ts:759-760 Inherited contextkey.ts ×201