From 0ba9420b3ab55353ccc90b1f1ef3c7a30807f027 Mon Sep 17 00:00:00 2001 From: Silvano Cerza Date: Thu, 23 Jan 2025 17:19:16 +0100 Subject: [PATCH] Change conflict setting default value and disable selection dropdown --- src/settings/settings.ts | 2 +- src/settings/tab.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/settings/settings.ts b/src/settings/settings.ts index 1ad935d..bb7ae29 100644 --- a/src/settings/settings.ts +++ b/src/settings/settings.ts @@ -24,7 +24,7 @@ export const DEFAULT_SETTINGS: GitHubSyncSettings = { syncInterval: 1, syncOnStartup: false, syncConfigDir: true, - conflictHandling: "ask", + conflictHandling: "overwrite", showStatusBarItem: true, showSyncRibbonButton: true, enableLogging: true, diff --git a/src/settings/tab.ts b/src/settings/tab.ts index 7a61b20..031619e 100644 --- a/src/settings/tab.ts +++ b/src/settings/tab.ts @@ -182,7 +182,8 @@ export default class GitHubSyncSettingsTab extends PluginSettingTab { this.plugin.settings.conflictHandling = value; await this.plugin.saveSettings(); }); - }); + }) + .setDisabled(true); containerEl.createEl("h2", { text: "Interface" });