Skip to content

Commit e7b4d5a

Browse files
committed
fix #284 swap sides in Compare following import conflict
This aligns our compare with the built-in one that VS Code will present if a similar conflict occurs when saving an isfs:// file.
1 parent 3eee6a6 commit e7b4d5a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/commands/compile.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ What do you want to do?`,
9494
return vscode.commands
9595
.executeCommand(
9696
"vscode.diff",
97-
file.uri,
9897
vscode.Uri.file(file.name).with({
9998
scheme: OBJECTSCRIPT_FILE_SCHEMA,
10099
authority: file.workspaceFolder,
101100
}),
102-
`Local • ${file.fileName} ↔ Server • ${file.name}`
101+
file.uri,
102+
`Server • ${file.name} ↔ Local • ${file.fileName}`
103103
)
104104
.then(() => Promise.reject());
105105
case "Overwrite on Server":

0 commit comments

Comments
 (0)