trigger sync after closing the conflicts editor

build/lib/i18n.resources.json

@@ -186,6 +186,10 @@
 			"name": "vs/workbench/contrib/outline",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/contrib/userDataSync",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/services/actions",
 			"project": "vscode-workbench"

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

@@ -153,7 +153,17 @@ class SyncActionsContribution extends Disposable implements IWorkbenchContributi
 				},
 				mode: 'jsonc'
 			};
-			this.editorService.openEditor(resourceInput).then(() => this.historyService.remove(resourceInput));
+			this.editorService.openEditor(resourceInput)
+				.then(editor => {
+					this.historyService.remove(resourceInput);
+					if (editor && editor.input) {
+						// Trigger sync after closing the conflicts editor.
+						const disposable = editor.input.onDispose(() => {
+							disposable.dispose();
+							this.userDataSyncService.sync(true);
+						});
+					}
+				});
 		}
 	}