fix microsoft#160133 (microsoft#167446)

Author: sandy081

src/vs/workbench/contrib/userDataSync/browser/userDataSyncConflictsView.ts

@@ -197,7 +197,13 @@ export class UserDataSyncConflictsViewPane extends TreeViewPane implements IUser
 				input1: { resource: conflictToOpen.remoteResource, label: localize('Theirs', 'Theirs'), description: remoteResourceName },
 				input2: { resource: conflictToOpen.localResource, label: localize('Yours', 'Yours'), description: localResourceName },
 				base: { resource: conflictToOpen.baseResource },
-				result: { resource: conflictToOpen.previewResource }
+				result: { resource: conflictToOpen.previewResource },
+				options: {
+					preserveFocus: true,
+					revealIfVisible: true,
+					pinned: true,
+					override: DEFAULT_EDITOR_ASSOCIATION.id
+				}
 			});
 			return;
 		}