constresult=awaitwindow.showInformationMessage(localize('deleted by them',"File '{0}' was deleted by them and modified by us.\n\nWhat would you like to do?",path.basename(uri.fsPath)),{modal:true},keepIt,deleteIt);
if(result===keepIt){
awaitrepository.add([uri]);
}elseif(result===deleteIt){
awaitrepository.rm([uri]);
}else{
thrownewError('Cancelled');
}
}elseif(resource.type===Status.DELETED_BY_US){
constkeepIt=localize('keep theirs',"Keep Their Version");
constdeleteIt=localize('delete',"Delete File");
constresult=awaitwindow.showInformationMessage(localize('deleted by us',"File '{0}' was deleted by us and modified by them.\n\nWhat would you like to do?",path.basename(uri.fsPath)),{modal:true},keepIt,deleteIt);