The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Update error message to make it more obvious things will be deleted (#65117)
eliotmetabasec831d2cabf41
diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/OutOfSyncOptions.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/OutOfSyncOptions.tsxindex c7ee78a1b33..7c57c72d2c8 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/OutOfSyncOptions.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/OutOfSyncOptions.tsx@@ -45,7 +45,7 @@ export const OutOfSyncOptions = (props: BranchSwitchOptionsProps) => {newBranchOption,{value: "discard",- label: t`Discard these changes (can’t be undone)`,+ label: t`Delete unsynced changes (can’t be undone)`,},];}, [currentBranch, variant]);diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/utils.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/utils.tsindex d013f9c6325..bc104e84fcb 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncConflictModal/utils.ts@@ -9,7 +9,7 @@ export const getContinueButtonText = (optionValue?: OptionValue) => {case "new-branch":return t`Push changes`;case "discard":- return t`Discard changes`;+ return t`Delete unsynced changes`;default:return t`Continue`;}